diff --git a/.tx/config b/.tx/config
index 72cb9fcd089ba53cbf87b607b903eeec5aed7701..90797735ced2c0b7f3bdf1f91193e52af5d8a1c5 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,25 +1,7 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com
 
-[FusionDirectory.fusiondirectory-core]
-source_file = locale/fusiondirectory.po
+[fusiondirectory-develop.fusiondirectory-core]
+file_filter = locale/<lang>.po
 source_lang = en
-trans.ca = locale/ca/fusiondirectory.po
-trans.cs_CZ = locale/cs_CZ/fusiondirectory.po
-trans.de = locale/de/fusiondirectory.po
-trans.es = locale/es/fusiondirectory.po
-trans.es_VE = locale/es_VE/fusiondirectory.po
-trans.fa_IR = locale/fa_IR/fusiondirectory.po
-trans.fr = locale/fr/fusiondirectory.po
-trans.id_ID = locale/id_ID/fusiondirectory.po
-trans.it = locale/it/fusiondirectory.po
-trans.nl = locale/nl/fusiondirectory.po
-trans.nb = locale/nb/fusiondirectory.po
-trans.pl = locale/pl/fusiondirectory.po
-trans.pt = locale/pt/fusiondirectory.po
-trans.ru = locale/ru/fusiondirectory.po
-trans.ug = locale/ug/fusiondirectory.po
-trans.vi = locale/vi/fusiondirectory.po
-trans.zh = locale/zh/fusiondirectory.po
-type = PO
 
diff --git a/locale/ca/fusiondirectory.po b/locale/ca.po
similarity index 69%
rename from locale/ca/fusiondirectory.po
rename to locale/ca.po
index 0fdd60bc93cc462c471c180307f42cdfe11d98bc..670dfd055f22fbb3c65b05e6a874ee380a323e54 100644
--- a/locale/ca/fusiondirectory.po
+++ b/locale/ca.po
@@ -1,54 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Jordi Mallach <jordi@softcatala.org>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ca\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -69,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -180,59 +178,58 @@ msgstr ""
 msgid "Warning"
 msgstr "Avís"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
-msgstr ""
+msgstr "Error"
 
 #: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:525
 #, php-format
@@ -240,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -289,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
-msgstr ""
+msgstr "UID"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Error d'LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -521,13 +505,10 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -703,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -722,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -817,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -868,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr "Mètode de contrasenya"
 
@@ -876,51 +859,45 @@ msgstr "Mètode de contrasenya"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-"La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
-
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+msgstr "La configuració %s/%s del FusionDirectori no és llegible. S'està avortant."
+
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "Error de la configuració"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"Les contrasenyes que heu introduït com a «Contrasenya nova» i «Contrasenya "
-"nova repetida» no concorden."
+msgstr "Les contrasenyes que heu introduït com a «Contrasenya nova» i «Contrasenya nova repetida» no concorden."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -928,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "No es xifrarà la sessió."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Entreu a la sessió amb SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1001,134 +978,131 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Configuració del PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Canvi de contrasenya"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "S'està exhaurint la memòria!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "S'han inhabilitat les comprovacions de les ACL dels usuaris"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Connector"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "La vostra configuració d'LDAP conté definicions d'esquema antigues:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Especifiqueu un nom d'usuari vàlid."
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Especifiqueu la vostra contrasenya."
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Error d'autenticació."
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr "El compte és blocat. Contacteu el vostre administrador de sistemes."
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"El vostre navegador té les galetes inhabilitades. Habiliteu les galetes i "
-"torneu a carregar aquesta pàgina abans d'entrar."
+msgstr "El vostre navegador té les galetes inhabilitades. Habiliteu les galetes i torneu a carregar aquesta pàgina abans d'entrar."
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Informació"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1139,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Qualitat"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1168,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Informació"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Entrada"
@@ -1196,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1208,9 +1178,8 @@ msgid "Password"
 msgstr "Contrasenya"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Emmagatzematge de contrasenyes"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -1229,14 +1198,21 @@ msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Connector"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Informació personal"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1244,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Genèric"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
-msgstr ""
+msgstr "Fax"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Servidor intermediari"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1294,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Telèfon"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1387,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Paràmetres de la contrasenya"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1878,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "La contrasenya nova és massa curta."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Informació genèrica de l'usuari"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "home"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "dona"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Nom"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Pàgina principal"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Mòbil"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Buscapersones"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Data de naixement"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2144,122 +1897,76 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Informació personal"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr "Cognoms"
+
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Nom"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Tractament"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Titulació acadèmica"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Data de naixement"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Gènere"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Llengua preferida"
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Imatge de l'usuari"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Restriccions d'entrada"
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organització"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Número de departament"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2271,66 +1978,52 @@ msgstr "Número de departament"
 msgid "Description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
-msgstr "Responsable"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Número d'empleat"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Categoria professional"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Número de sala"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Número de telèfon"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Número de buscapersones"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Llengua preferida"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Número de mòbil"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Número de fax"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Província"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2338,306 +2031,439 @@ msgstr "Província"
 msgid "Location"
 msgstr "Localització"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Adreça postal"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Província"
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "Adreça postal personal"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Adreça"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
-msgstr "Número de telèfon personal"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Mètode de contrasenya de l'usuari"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Núm de sala"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Les entrades no coincideixen"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Número de sala"
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Mòbil"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Buscapersones"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organització"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Núm de department"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Número de departament"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Núm d'empleat"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Número d'empleat"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Categoria professional"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr "Responsable"
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "Adreça postal personal"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Telèfon privat"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr "Número de telèfon personal"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Pàgina principal"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Nom"
+
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Directori personal"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Intèrpret d'ordres"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Compte"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Grup de l'usuari"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2756,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2769,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Nom de l'organització"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Categoria"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Número de telèfon"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Base"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Paràmetres administratius"
+msgid "Postal address"
+msgstr "Adreça postal"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Número de telèfon"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Continua"
-
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Objecte"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Continua"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Departaments"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Adreça"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2899,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Estat"
 
@@ -2908,8 +2719,8 @@ msgstr "Estat"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Localitat"
 
@@ -2917,24 +2728,26 @@ msgstr "Localitat"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr ""
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2952,11 +2765,24 @@ msgid "List of users"
 msgstr ""
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr ""
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr ""
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2968,7 +2794,7 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Canvia la contrasenya"
@@ -2989,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -3005,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr ""
 
@@ -3022,39 +2848,39 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "cap"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3062,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3121,48 +2947,94 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:23
-msgid "Group submenu entry"
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:31
-msgid "Group menu entry"
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:147
-msgid "Edit group"
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:160
-msgid "Remove group"
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
@@ -3171,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3283,7 +3151,7 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr ""
@@ -3301,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr ""
 
@@ -3321,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3395,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3426,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr ""
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr ""
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3499,29 +3374,29 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr ""
 
@@ -3531,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Mostra els usuaris"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3544,100 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Grup de l'usuari"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nom de l'objecte"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3659,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3797,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3914,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Canceŀla"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3926,303 +3835,300 @@ msgstr "Canceŀla"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Aplica"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Desa"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr ""
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Edita…"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Edita %s…"
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Enrere"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Aquest compte no té extensions de %s vàlides!"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Aquest compte té paràmetres de %s habilitats. Podeu inhabilitar-los fent "
-"clic a sota."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Aquest compte té paràmetres de %s habilitats. Podeu inhabilitar-los fent clic a sota."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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"
+msgstr "Feu clic al botó «Edita» a sota per canviar la informació d'aquest diàleg"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "gener"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "febrer"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "març"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "abril"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "maig"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "juny"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "juliol"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "agost"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "setembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "octubre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "novembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "desembre"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "diumenge"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "dilluns"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "dimarts"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "dimecres"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "dijous"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "divendres"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "dissabte"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4243,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Canceŀla-ho tot"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "El meu compte"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr ""
 
@@ -4351,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr ""
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4568,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4631,223 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4907,7 +4816,6 @@ msgstr "Feu clic ací per entrar"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4917,6 +4825,7 @@ msgstr "Feu clic ací per entrar"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
 
@@ -4928,14 +4837,14 @@ msgstr "S'ha detectat un conflicte de sessions"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:14
@@ -4968,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4988,9 +4897,9 @@ msgstr "Contrasenya nova repetida"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr "Qualitat de la contrasenya"
 
@@ -5122,9 +5031,9 @@ msgstr "Només lectura"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
 
@@ -5208,10 +5117,6 @@ msgstr "Identificat com a:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "Menú principal del FusionDirectory"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5234,17 +5139,17 @@ msgstr "Canvieu la vostra contrasenya"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Contrasenya actual"
 
@@ -5411,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5554,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5576,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5598,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5659,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5673,8 +5579,8 @@ msgstr "Seleccioneu la llengua preferida"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5689,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5822,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5894,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Canviar la contrasenya afecta la vostra autenticació al correu, servidor "
-"intermediari, Samba i serveis UNIX."
+msgstr "Canviar la contrasenya afecta la vostra autenticació al correu, servidor intermediari, Samba i serveis UNIX."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Repeteix la contrasenya nova"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Diàleg de canvi de contrasenya"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Neteja els camps"
 
@@ -5942,55 +5841,10 @@ msgstr "Neteja els camps"
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificats"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Certificat estàndard"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Certificat S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Certificat PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Imatge personal"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Suprimeix la imatge"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Paràmetres de l'usuari"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Cognoms"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Nom"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Neteja la contrasenya"
@@ -5999,59 +5853,17 @@ msgstr "Neteja la contrasenya"
 msgid "Set new password"
 msgstr "Estableix una contrasenya nova"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Informació personal"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Canvia la imatge"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nom de la plantilla"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Llengua preferida"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Telèfon privat"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Emmagatzematge de contrasenyes"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Restringeix l'entrada a"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP o xarxa"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Núm de department"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Núm d'empleat"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Imatge personal"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Núm de sala"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Imatge de l'usuari"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr ""
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Suprimeix la imatge"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6068,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6103,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6265,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6275,20 +6061,13 @@ msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Per canviar la vostra contrasenya personal, empreu els camps següents. Els "
-"canvis tenen efecte immediatament. Memoritzeu la contrasenya nova, perquè "
-"l'usuari no podrà entrar sense ella."
+msgstr "Per canviar la vostra contrasenya personal, empreu els camps següents. Els canvis tenen efecte immediatament. Memoritzeu la contrasenya nova, perquè l'usuari no podrà entrar sense ella."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Qualitat"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6436,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6499,3 +6283,15 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/cs_CZ/fusiondirectory.po b/locale/cs_CZ.po
similarity index 65%
rename from locale/cs_CZ/fusiondirectory.po
rename to locale/cs_CZ.po
index 16a8ba1b372559ebdf744ea188f18e47b9aa1cdd..47347d5d56ce19dccd902a72374620f7eb74672a 100644
--- a/locale/cs_CZ/fusiondirectory.po
+++ b/locale/cs_CZ.po
@@ -1,55 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# pavelb <pavel.borecki@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/"
-"FusionDirectory/language/cs_CZ/)\n"
-"Language: cs_CZ\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr "nastavení FusionDirectory, krok 3 ze 3"
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr "závěrečné doladění chování FusionDirectory"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "ne"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "ano"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "chyba instalátoru"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "Hodnota délky nečinnosti musí být číslo!"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "Hodnota maximální délky prodlevy odpovědi LDAPu musí být číslo!"
 
@@ -70,109 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "V tomto kroku vyberete Vámi upřednostňovaný jazyk."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "automaticky"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "kontrola LDAPu"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "prozkoumání Vášeho LDAPu, zda je slučitelný s FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "kontroluje se přítomnost kořenového objektu"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "kontrolují se třídy objektů v kořenovém objektu"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "kontrolují se oprávnění na LDAP databázi"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "kontroluje se, zda neexistují „neviditelná“ oddělení"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "kontroluje se, zda neexistují „neviditelní“ uživatelé"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "kontroluji, zda již existuje účet správce FusionDirectory/GOsa"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "kontroluje se, zda neexistují účty uživatelů mimo příslušný podstrom"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "kontroluje se, zda neexistují účty skupin mimo příslušný podstrom"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
-msgstr ""
-"kontroluje se, zda neexistují duplicity v číselných identifikátorech "
-"uživatelů (UID)"
+msgstr "kontroluje se, zda neexistují duplicity v číselných identifikátorech uživatelů (UID)"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
-msgstr ""
-"kontroluje se, zda neexistují duplicity v číselných identifikátorech skupin "
-"(GID)"
+msgstr "kontroluje se, zda neexistují duplicity v číselných identifikátorech skupin (GID)"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "kontroluje se, zda neexistují zastaralá nastavení USB zařízení"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "kontroluje se, zda neexistují staré služby, které je třeba migrovat"
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "kontroluje se, zda neexistují zastaralá nastavení nabídek aplikace"
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "dotaz do LDAPu byl neúspěšný"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Pravděpodobně chybí 'kořenový objekt'."
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -185,63 +178,56 @@ msgstr "Pravděpodobně chybí 'kořenový objekt'."
 msgid "Warning"
 msgstr "varování"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
-msgstr ""
-"Bylo nalezeno %s duplicitních hodnot atributu 'uidNumber' (číselný "
-"identifikátor uživatele)."
-
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+msgstr "Bylo nalezeno %s duplicitních hodnot atributu 'uidNumber' (číselný identifikátor uživatele)."
+
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "v pořádku"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
-msgstr ""
-"Bylo nalezeno %s duplicitních hodnot atributu 'gidNumber' (číselný "
-"identifikátor skupiny)."
+msgstr "Bylo nalezeno %s duplicitních hodnot atributu 'gidNumber' (číselný identifikátor skupiny)."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-"Bylo nalezeno %s účtů skupin, nacházejících se mimo příslušný strom '%s'."
+msgstr "Bylo nalezeno %s účtů skupin, nacházejících se mimo příslušný strom '%s'."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "přesunout"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
-msgstr ""
-"Bylo nalezeno %s účtů uživatelů, nacházejících se mimo příslušný strom '%s'."
+msgstr "Bylo nalezeno %s účtů uživatelů, nacházejících se mimo příslušný strom '%s'."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "selhalo"
 
@@ -251,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr "Zadaný uživatel '%s' nemá neomezený přístup do databáze Vašeho LDAPu."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "migrovat"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "chyba během migrace"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Oddělení '%s' nelze migrovat:"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr "Bylo nalezeno %s oddělení, která nebudou viditelná z FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Nalezen správcovský účet z GOsa 2.5: %s"
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr "Ve Vašem LDAP neexistuje platný účet správce FusionDirectory 1.x.x."
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -300,236 +287,217 @@ msgstr "Ve Vašem LDAP neexistuje platný účet správce FusionDirectory 1.x.x.
 msgid "Create"
 msgstr "vytvořit"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "uživatelé"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "skupiny"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Ve Vašem LDAPu neexistuje účet správce FusionDirectory/GOsa."
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Nelze přidat ACL pro uživatele '%s':"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "chyba na vstupu"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "UID"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "chyba hesla"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "Zadaná hesla se neshodují!"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "Zadejte platné uživatelské jméno (ID)!"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "chyba"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr "Přidání účtu správce selhalo: objekt '%s' již existuje!"
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "chyba LDAPu"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "Uživatele nelze přesunout do požadovaného oddělení."
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "skupina bude přesunuta z"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
-msgstr "do"
+msgstr "pro"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "spolu s tím probíhá také aktualizace následujících odkazů"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "uživatel bude přesunut z"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "tyto odkazy budou aktualizovány"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"Chybí kořenový objekt LDAPu. Ten je nezbytný proto, abyste mohli používat "
-"služeb Vašeho LDAPu."
+msgstr "Chybí kořenový objekt LDAPu. Ten je nezbytný proto, abyste mohli používat služeb Vašeho LDAPu."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "pokusit se vytvořit kořenový objekt"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
-msgstr ""
-"Kořenový objekt se nepodařilo vytvořit – pokuste se to udělat ručním zásahem."
+msgstr "Kořenový objekt se nepodařilo vytvořit – pokuste se to udělat ručním zásahem."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Chybí chybí třída objektů '%s' FusionDirectory!"
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Zkontrolujte prosím Vaši instalaci."
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"Nedaří se manipulace s typem struktury kořenového objektu. Prosím pokuste se "
-"přidat třídu objektů '%s' ručním zásahem."
+msgstr "Nedaří se manipulace s typem struktury kořenového objektu. Prosím pokuste se přidat třídu objektů '%s' ručním zásahem."
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "selhalo zkopírování '%s' do '%s':"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Je třeba zmigrovat %s zařízení."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "Přidání '%s' do LDAPu selhalo: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "aktualizace '%s' selhala: %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Je třeba zmigrovat tyto služby %s."
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "přidat"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -537,13 +505,10 @@ msgstr "přidat"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "odebrat"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "%s nabídek aplikací nebude zmigrováno."
@@ -566,9 +531,7 @@ msgstr "kontrola instalace"
 
 #: setup/class_setupStep_Checks.inc:40
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr ""
-"základní kontrola toho, zda je PHP a jeho rozšířující moduly ve vyhovujících "
-"verzích"
+msgstr "základní kontrola toho, zda je PHP a jeho rozšířující moduly ve vyhovujících verzích"
 
 #: setup/class_setupStep_Checks.inc:64
 msgid "Checking PHP version"
@@ -590,17 +553,13 @@ msgstr "FusionDirectory potřebuje tento modul pro komunikaci s LDAP serverem."
 #: setup/class_setupStep_Checks.inc:81
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr ""
-"FusionDirectory potřebuje tento modul pro přizpůsobení uživatelského "
-"rozhraní místním odlišnostem (formát data a času, měrné jednotky, atp.)."
+msgstr "FusionDirectory potřebuje tento modul pro přizpůsobení uživatelského rozhraní místním odlišnostem (formát data a času, měrné jednotky, atp.)."
 
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr ""
-"FusionDirectory potřebuje tento modul pro komunikaci různými protokoly s "
-"různými typy serverů."
+msgstr "FusionDirectory potřebuje tento modul pro komunikaci různými protokoly s různými typy serverů."
 
 #: setup/class_setupStep_Checks.inc:97
 msgid "FusionDirectory requires this module for the samba integration."
@@ -610,9 +569,7 @@ msgstr "FusionDirectory potřebuje tento modul pro začlenění Samby."
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr ""
-"Aby bylo možné ve FusionDirectory využívat SSHA šifrování, musí být "
-"nainstalován jeden z těchto modulů: 'mhash', nebo 'sha1'."
+msgstr "Aby bylo možné ve FusionDirectory využívat SSHA šifrování, musí být nainstalován jeden z těchto modulů: 'mhash', nebo 'sha1'."
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "FusionDirectory requires this module to talk to an IMAP server."
@@ -620,13 +577,11 @@ msgstr "FusionDirectory potřebuje tento modul pro komunikaci s IMAP serverem."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "mbstring"
-msgstr ""
+msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:121
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr ""
-"FusionDirectory potřebuje tento modul pro práci se znaky v univerzálním "
-"kódování (unicode)."
+msgstr "FusionDirectory potřebuje tento modul pro práci se znaky v univerzálním kódování (unicode)."
 
 #: setup/class_setupStep_Checks.inc:128
 msgid "MDB2"
@@ -636,9 +591,7 @@ msgstr ""
 msgid ""
 "FusionDirectory requires this module to communicate with several supported "
 "databases."
-msgstr ""
-"FusionDirectory tento modul potřebuje pro komunikaci s databázemi, které "
-"podporuje."
+msgstr "FusionDirectory tento modul potřebuje pro komunikaci s databázemi, které podporuje."
 
 #: setup/class_setupStep_Checks.inc:134
 msgid ""
@@ -667,38 +620,27 @@ msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"„register_globals“ je mechanizmus v PHP pro registraci všech globálních "
-"proměnných, které jsou tak dostupné ze skriptů aniž by bylo třeba měnit "
-"jejich rozsah. Jenže to může rizikové z hlediska zabezpečení."
+msgstr "„register_globals“ je mechanizmus v PHP pro registraci všech globálních proměnných, které jsou tak dostupné ze skriptů aniž by bylo třeba měnit jejich rozsah. Jenže to může rizikové z hlediska zabezpečení."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'register_globals' a nastavte jej na "
-"'off'. "
+msgstr "Vyhledejte ve svém php.ini parametr 'register_globals' a nastavte jej na 'off'. "
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
-"PHP tuto hodnotu používá pro „úklid“ (garbage collector) při odstraňování "
-"starých relací."
+msgstr "PHP tuto hodnotu používá pro „úklid“ (garbage collector) při odstraňování starých relací."
 
 #: setup/class_setupStep_Checks.inc:176
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Nastavení této hodnoty na jeden den zabrání ztrátě relace a cookies dříve, "
-"než skutečně vyprší nastavený časový limit."
+msgstr "Nastavení této hodnoty na jeden den zabrání ztrátě relace a cookies dříve, než skutečně vyprší nastavený časový limit."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'session.gc_maxlifetime' a nastavte jej "
-"na hodnotu '86400' a vyšší."
+msgstr "Vyhledejte ve svém php.ini parametr 'session.gc_maxlifetime' a nastavte jej na hodnotu '86400' a vyšší."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -713,9 +655,7 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'session.auto_start' a nastavte jej na "
-"'off'."
+msgstr "Vyhledejte ve svém php.ini parametr 'session.auto_start' a nastavte jej na 'off'."
 
 #: setup/class_setupStep_Checks.inc:193
 msgid ""
@@ -732,14 +672,11 @@ msgstr ""
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Tato volba ovlivňuje to, jak PHP zachází s výstupem. Pro zvýšení výkonu "
-"nastavte na 'vypnuto'."
+msgstr "Tato volba ovlivňuje to, jak PHP zachází s výstupem. Pro zvýšení výkonu nastavte na 'vypnuto'."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'implicit_flush' a nastavte jej na 'off'."
+msgstr "Vyhledejte ve svém php.ini parametr 'implicit_flush' a nastavte jej na 'off'."
 
 #: setup/class_setupStep_Checks.inc:209
 msgid "The Execution time should be at least 30 seconds."
@@ -747,36 +684,29 @@ msgstr "PHP skripty by měly dostat čas alespoň 30 vteřin na to, aby proběhl
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'max_execution_time' a nastavte jej na "
-"hodnotu '30' a vyšší."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Vyhledejte ve svém php.ini parametr 'max_execution_time' a nastavte jej na hodnotu '30' a vyšší."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Pro zlepšení zabezpečení nastavte PHP tak, aby neposkytovalo jakékoli "
-"informace o serveru, na kterém běží."
+msgstr "Pro zlepšení zabezpečení nastavte PHP tak, aby neposkytovalo jakékoli informace o serveru, na kterém běží."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'expose_php' a nastavte jej na 'off'."
+msgstr "Vyhledejte ve svém php.ini parametr 'expose_php' a nastavte jej na 'off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Výkonnost Vašeho serveru můžete zlepšit nastavením parametru "
-"'magic_quotes_gpc' na 'off'."
+msgstr "Výkonnost Vašeho serveru můžete zlepšit nastavením parametru 'magic_quotes_gpc' na 'off'."
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Vyhledejte ve svém php.ini parametr 'zend.ze1_compatibility_mode' a nastavte "
-"jej na 'off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Vyhledejte ve svém php.ini parametr 'zend.ze1_compatibility_mode' a nastavte jej na 'off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -791,10 +721,7 @@ msgstr "Nelze zapisovat do souboru s nastaveními."
 msgid ""
 "FusionDirectory reads its configuration from a file located in (%s/%s). The "
 "setup can write the configuration directly if it is writeable."
-msgstr ""
-"FusionDirectory načítá svá nastavení ze souboru nacházejícího se v (%s/%s). "
-"Instalátor může zapsat nastavení přímo do tohoto souboru, pokud k tomu bude "
-"mít dostatečná oprávnění."
+msgstr "FusionDirectory načítá svá nastavení ze souboru nacházejícího se v (%s/%s). Instalátor může zapsat nastavení přímo do tohoto souboru, pokud k tomu bude mít dostatečná oprávnění."
 
 #: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
 msgid "FusionDirectory settings 2/3"
@@ -816,9 +743,7 @@ msgstr "nastavení připojení k LDAPu"
 msgid ""
 "This dialog performs the basic configuration of the LDAP connectivity for "
 "FusionDirectory."
-msgstr ""
-"V tomto dialogu budou provedena základní nastavení pro komunikaci "
-"FusionDirectory s LDAPem."
+msgstr "V tomto dialogu budou provedena základní nastavení pro komunikaci FusionDirectory s LDAPem."
 
 #: setup/class_setupStep_Ldap.inc:117
 #, php-format
@@ -847,7 +772,7 @@ msgstr "Přihlášení se jako uživatel '%s' k serveru '%s' proběhlo úspěšn
 #: setup/class_setupStep_Finish.inc:36
 #: ihtml/themes/default/copyPasteDialog.tpl.c:26
 msgid "Finish"
-msgstr "dokončit"
+msgstr "dokončení"
 
 #: setup/class_setupStep_Finish.inc:37
 msgid "Write configuration file"
@@ -861,9 +786,7 @@ msgstr "dokončení – zapsání nastavení do souboru"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"Váš soubor s konfigurací je v tuto chvíli čitelný úplně pro všechny. Upravte "
-"nastavení oprávnění pro přístup k němu."
+msgstr "Váš soubor s konfigurací je v tuto chvíli čitelný úplně pro všechny. Upravte nastavení oprávnění pro přístup k němu."
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -875,15 +798,13 @@ msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
-msgstr ""
-"Po stažení a umístění souboru do %s se prosím ujistěte, že %s je oprávněn "
-"číst pouze uživatelský účet, pod kterým běží webový server a nikdo jiný."
+msgstr "Po stažení a umístění souboru do %s se prosím ujistěte, že %s je oprávněn číst pouze uživatelský účet, pod kterým běží webový server a nikdo jiný."
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "hotovo"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "následující"
 
@@ -902,8 +823,7 @@ msgstr "hodnota, zadaná jako '%s' musí být číslo"
 
 #: setup/class_setupStep_Config1.inc:121 setup/setup_config1.tpl.c:32
 msgid "GID / UID min id"
-msgstr ""
-"o kolik vyšší číslo má být nejnižší přidělené GID / UID oproti základu (níže)"
+msgstr "o kolik vyšší číslo má být nejnižší přidělené GID / UID oproti základu (níže)"
 
 #: setup/class_setupStep_Config1.inc:125 setup/class_setupStep_Config1.inc:129
 #, php-format
@@ -931,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr "Hodnota počtu odlišných znaků musí být číslo."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr "způsob uložení hesla"
 
@@ -939,49 +859,45 @@ msgstr "způsob uložení hesla"
 msgid "Error: Password method not available!"
 msgstr "Chyba: tento způsob uložení hesla není k dispozici!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "fatální chyba"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Nastavení %s/%s FusionDirectory není čitelné. Akce byla zrušena."
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "chyba v nastavení"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-"Adresář  '%s', nastavený jako místo pro provedení kompilace, není přístupný!"
+msgstr "Adresář  '%s', nastavený jako místo pro provedení kompilace, není přístupný!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Zadání v 'nové heslo' a 'zopakování nového hesla' se neshodují!"
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -989,71 +905,67 @@ msgstr "Zadání v 'nové heslo' a 'zopakování nového hesla' se neshodují!"
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "nové heslo"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
-msgstr ""
-"Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí "
-"přímo na klávesnici)."
+msgstr "Heslo obsahuje znaky, které mohou být problematické (např. se nenacházejí přímo na klávesnici)."
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "Relace nebude šifrována."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "otevřít relaci šifrovanou pomocí protokolu SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr "nepodařilo se nalézt účet %s"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr "bylo nalezeno vícero účtů s názvem %s"
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr "neexistuje účet používající e-mailovou adresu %s"
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr "e-mailová adresa %s je využívána více účty"
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-"Nastal problém s poštovním serverem – obraťte se prosím na svého správce "
-"systémů."
+msgstr "Nastal problém s poštovním serverem – obraťte se prosím na svého správce systémů."
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr "tato poukázka (token) je neplatná"
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "Externí program pro úpravu hesel ohlásil problém:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1064,145 +976,133 @@ msgstr "Smarty"
 #: html/main.php:136
 #, 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 "Nemohu nalézt soubor '%s' – opravte to prosím spuštěním '%s' (na serveru)."
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "nastavení PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr ""
-"Fatální chyba: v PHP je zapnuto 'register globals'. Dokud to Váš správce "
-"systémů neopraví, nebude možné se přihlásit do FusionDirectory."
+msgstr "Fatální chyba: v PHP je zapnuto 'register globals'. Dokud to Váš správce systémů neopraví, nebude možné se přihlásit do FusionDirectory."
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "změna hesla"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr "Platnost Vašeho hesla již brzy skončí – změňte ho prosím!"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "Dochází volná kapacita operační paměti!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "kontrola dle ACL je vypnuta"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "zásuvný modul"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "chyba v nastavení"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"Fatální chyba: ne všechny proměnné POST byly PHP přeneseny – sdělte to "
-"prosím svému správci systémů!"
+msgstr "Fatální chyba: ne všechny proměnné POST byly PHP přeneseny – sdělte to prosím svému správci systémů!"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "Tato relace není šifrována!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"Nastavení doby udržování relace bude bráno z php.ini namísto z Vašeho "
-"fusiondirectory.conf. "
+msgstr "Nastavení doby udržování relace bude bráno z php.ini namísto z Vašeho fusiondirectory.conf. "
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "chyba ve Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "Vyskytl se problém s nastavením ověřování!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr "Při současném nastavení ověřování se nedaří nalézt platného uživatele!"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr "Informace o uživateli není jedinečná v rámci nastavených stromů LDAPu!"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
-msgstr ""
-"Nedaří se zjistit informace o tom, jaká LDAP schémata jsou nainstalována!"
+msgstr "Nedaří se zjistit informace o tom, jaká LDAP schémata jsou nainstalována!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Váš LDAP adresář obsahuje staré definice schémat:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Zadejte prosím platné uživatelské jméno!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Zadejte prosím své heslo!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "chyba ověření"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr ""
-"Nelze získat informace o uživateli potřebné pro ověření pomocí htaccess."
+msgstr "Nelze získat informace o uživateli potřebné pro ověření pomocí htaccess."
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Zkontrolujte prosím správnost zadaného uživatelského jména a hesla."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Účet je uzamčen. Prosím kontaktujte svého správce systémů."
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Váš webový prohlížeč má zakázané cookies. Prosím povolte je a před dalším "
-"pokusem o přihlášení stránku nechejte tuto stránku načíst znovu!"
+msgstr "Váš webový prohlížeč má zakázané cookies. Prosím povolte je a před dalším pokusem o přihlášení stránku nechejte tuto stránku načíst znovu!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "informace"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1213,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "odolnost"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1242,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "přepnout informace"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "uživatelské jméno"
@@ -1270,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1282,13 +1178,12 @@ msgid "Password"
 msgstr "heslo"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "chyba hesla"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "stroj"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -1296,21 +1191,28 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "port"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "zásuvný modul"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "osobní informace"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1318,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Vítejte, %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "obecné"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
-msgstr ""
+msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "e-mail"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "fax"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1368,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "skupina"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "oddělení"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "telefon"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "aplikace"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "server"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "tenký klient"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "pracovní stanice"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "skupina objektu"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1461,469 +1360,461 @@ msgstr "nastavení"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "rozšíření"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "jazyk"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "vzhled"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "časová zóna"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "nastavení hesel"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "minimální délka hesla"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "omezovat platnost uživatelský účtů na základě platnosti jejich hesel"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "povolit filtrování uživatelů dle jejich hlavních skupin"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "ve výpisech zobrazovat souhrny"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "respektovat administrativní rozdělení"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "zapnout kopírování a vkládání položek"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "přihlašování a relace"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "atribut použitý pro přihlašování"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "vynucovat šifrované spojení"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "varovat, pokud relace není šifrována"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "pamatovat si nastavení dialogu filtru"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Doba nečinnosti, po jejímž uplynutí bude relace automaticky ukončena."
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "zálohy / obnovování"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "zapnout pořizování snímků aktuálního stavu"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "podstrom pro uložení snímků"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "různé"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "háčky"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr "umístění účtů uživatelů a skupin"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "atribut účtu uživatele použitý jako DN"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "do DN uživatelských účtů zahrnovat i oslovení"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "automatické vytváření názvů účtů uživatelů (UID)"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "diagnostika"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "maximální prodleva odpovědi LDAPu"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "zaznamenávat statistiky LDAPu"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "úroveň podrobností diagnostických informací"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1952,266 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "Nové heslo nelze použít – je příliš krátké (není bezpečné)."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
-msgstr ""
-"Kontrolní háček (Check-hook) ohlásil problém: %s. Heslo nebylo změněno!"
+msgstr "Kontrolní háček (Check-hook) ohlásil problém: %s. Heslo nebylo změněno!"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "Heslo, které jste zadal(a) jako své stávající neodpovídá."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "Nejste oprávněn(a) změnit si své heslo."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "změnit heslo uživatele"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "obecné informace o uživateli"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "neznámé"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr "Zadejte prosím jedinou IP adresu nebo kombinaci síť/maska podsítě!"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "žena"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "muž"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Soubor nelze nahrát!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr "Zvolený způsob uložení hesla již není k dispozici."
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
-"Fotografii uživatele nelze uložit – FusionDirectory k tomu potřebuje, aby "
-"byl nainstalován balíček 'php5-imagick'!"
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
-"Nelze vytvořit RDN: pro vytváření podružných RND není dovoleno žádné +!"
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "Nemohu vytvořit RDN: není definován atribut!"
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr "Nemohu vytvořit RDN: neplatné parametry atributu!"
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
-msgstr "Zvolený způsob ukládání hesel vyžaduje počáteční nastavení!"
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "jméno"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "křestní jméno"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "osobní webové stránky"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "mobilní"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "pager"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "datum narození"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "jednotka"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "označení budovy"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "povolání"
 
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "kde se osoba nachází"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "popis jednotky"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "funkční zařazení"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "viditelné všem"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "ulice"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "role"
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "poštovní směrovací číslo (PSČ)"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "obecná nastavení uživatele"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2222,122 +1897,76 @@ msgstr "obecná nastavení uživatele"
 msgid "User"
 msgstr "uživatel"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "osobní informace"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "příjmení"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "identifikace uživatele"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "jméno"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "oslovení"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "akademický titul"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "datum narození"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "pohlaví"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "upřednostňovaný jazyk"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "základ"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "fotografie uživatele"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "omezení pro přihlášování"
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "organizace"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "číslo oddělení"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2349,66 +1978,52 @@ msgstr "číslo oddělení"
 msgid "Description"
 msgstr "popis"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
-msgstr "nadřízený"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "číslo zaměstnance"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "typ zaměstnaneckého poměru"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "označení místnosti"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "telefonní číslo"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "číslo pageru"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "upřednostňovaný jazyk"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "číslo mobilního telefonu"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "faxové číslo"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "stát"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2416,306 +2031,439 @@ msgstr "stát"
 msgid "Location"
 msgstr "umístění"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "poštovní adresa"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "stát"
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "poštovní adresa domů"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "adresa"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
-msgstr "telefon domů"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "způsob uložení hesla tohoto uživatele"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "označení místnosti"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "položky se liší"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "označení místnosti"
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
-msgstr "zvolte prosím požadované položky"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "pracovní stanice s OS MS Windows"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "mobilní"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "terminál"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "POSIX"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "pager"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "upravit POSIXové vlastnosti"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "upravit e-mailové vlastnosti"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "fax"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "upravit vlastnosti pro Sambu"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "upravit vlastnosti telefonu"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "organizační informace"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "nabídka"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "organizace"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Upravit nabídku Start."
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "číslo oddělení"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "prostředí"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "číslo oddělení"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "upravit vlastnosti prostředí"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "číslo zaměstnance"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "číslo zaměstnance"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "typ zaměstnaneckého poměru"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr "nadřízený"
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "poštovní adresa domů"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "soukromý telefon"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr "telefonní číslo domů"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "osobní webové stránky"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr "vyberte prosím požadované položky"
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "název"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
-msgstr "domovský adresář"
+msgstr "domovská složka"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "hlavní skupina"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "stav"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "vynutit konkrétní UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "členství ve skupinách"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "účet"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "Uživatel musí při prvním přihlášení změnit heslo."
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "systém důvěryhodnosti"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "režim důvěryhodnosti"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "zakázáno"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "plný přístup"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "povolit přístup k těmto strojům"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "upravit POSIXová nastavení uživatele"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "nenastavené"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automatické"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "platnost skončila"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "aktivní"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "platnost hesla skončila"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "heslo nelze změnit"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Vypršel časový limit při čekání na zámek – zámek bude proto ignorován!"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "skupina uživatelů"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2812,14 +2560,7 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr ""
-"Dobrý den,\n"
-"\n"
-"Zde jsou Vaše přihlašovací údaje:\n"
-"- uživatelské jméno: %s\n"
-"- odkaz pro obnovu hesla: %s\n"
-"\n"
-"Výše uvedený odkaz je platný pouze 10 minut!"
+msgstr "Dobrý den,\n\nZde jsou Vaše přihlašovací údaje:\n- uživatelské jméno: %s\n- odkaz pro obnovu hesla: %s\n\nVýše uvedený odkaz je platný pouze 10 minut!"
 
 #: plugins/admin/password/class_recoveryConfig.inc:111
 msgid "Second email"
@@ -2841,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2852,126 +2593,107 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr ""
-"Dobrý den,\n"
-"\n"
-"Vaše heslo bylo změněno.\n"
-"Uživatelské jméno je samozřejmě pořád stejné – %s"
+msgstr "Dobrý den,\n\nVaše heslo bylo změněno.\nUživatelské jméno je samozřejmě pořád stejné – %s"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "název organizace"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "kategorie"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "telefonní číslo"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "základ"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "administrativní nastavení"
+msgid "Postal address"
+msgstr "poštovní adresa"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "telefonní číslo"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "část (prvek) názvu domény"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "Pro tuto administrativní jednotku již není k dispozici volná značka!"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Označeno jako '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "pokračovat"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "neznámé"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "probíhá přesouvání '%s' do '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "objekt"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "zkopírování %s SELHALO – operace se ruší"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "pokračovat"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "oddělení"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "název oddělení"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "adresa"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "telefon"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "objekt '%s' již je označkován"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "probíhá pridávání značky (%s) na objekt '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "probíhá odebírání značky z objektu '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "doména"
 
@@ -2988,8 +2710,8 @@ msgstr "část (prvek) názvu domény"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "zemÄ›"
 
@@ -2997,8 +2719,8 @@ msgstr "zemÄ›"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "místo"
 
@@ -3006,24 +2728,26 @@ msgstr "místo"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "akce"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "upravit"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "název země"
@@ -3041,11 +2765,24 @@ msgid "List of users"
 msgstr "seznam uživatelů"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "šablona"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "příjmení"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "jméno"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3057,7 +2794,7 @@ msgstr "šablona"
 msgid "Properties"
 msgstr "vlastnosti"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "změňit heslo"
@@ -3078,15 +2815,15 @@ msgstr "aplikovat šablonu"
 msgid "New user from template"
 msgstr "vytvořit nového uživatele pomocí šablony"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "upravit uživatele"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
-msgstr ""
+msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "odebrat uživatele"
 
@@ -3094,16 +2831,16 @@ msgstr "odebrat uživatele"
 msgid "Manage users"
 msgstr "spravovat uživatele"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr "oprávnění"
 
@@ -3111,41 +2848,39 @@ msgstr "oprávnění"
 msgid "You have no permission to change this users password!"
 msgstr "Nejste oprávněn(a) měnit heslo tohoto uživatele!"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "žádná/ý/é"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
-msgstr "chyba v oprávnění"
+msgstr "chyba oprávnění"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "zamykání účtu"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"Způsob ukládání hesel '%s' nepodporuje uzamykání účtů. Účet (%s) proto "
-"nebude uzamčen!"
+msgstr "Způsob ukládání hesel '%s' nepodporuje uzamykání účtů. Účet (%s) proto nebude uzamčen!"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "povolit účet"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "zamknout účet"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3153,57 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr "Ve vaší konfiguraci nelze nalézt SID skupiny!"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "skupina v SambÄ›"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "správci domény"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "doménoví uživatelé"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "doménoví hosté"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "speciální skupina (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"Přidání UID '%s' do skupiny '%s' se nezdařilo: nedaří se nalézt objekt "
-"tohoto uživatele!"
+msgstr "Přidání UID '%s' do skupiny '%s' se nezdařilo: nedaří se nalézt objekt tohoto uživatele!"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
-msgstr ""
-"Přidání UID '%s' do skupiny '%s' se nezdařilo: toto UID je použito "
-"vícenásobně!"
+msgstr "Přidání UID '%s' do skupiny '%s' se nezdařilo: toto UID je použito vícenásobně!"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "! neznámé UID"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"Příliš mnoho vyhledaných výsledků. Zobrazeno bude pouze prvních %s položek!"
+msgstr "Příliš mnoho vyhledaných výsledků. Zobrazeno bude pouze prvních %s položek!"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "nedaří se nalézt SID pro '%s'!"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "nedaří se nalézt RIDBASE pro '%s'!"
@@ -3217,23 +2947,23 @@ msgstr "gidNumber '%s' jej již používáno %s!"
 msgid "Generic group settings"
 msgstr "nastavení skupiny – obecné"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "typ skupiny Samby"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "název domény Samba"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "skupina zvedající telefony"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "skupinou pro Nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "člen skupiny"
 
@@ -3261,118 +2991,159 @@ msgstr "odebrat skupinu"
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "POSIX"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "upravit POSIXové vlastnosti"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "upravit e-mailové vlastnosti"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "upravit vlastnosti pro Sambu"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "upravit vlastnosti telefonu"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "nabídka"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Upravit nabídku Start."
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "prostředí"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "upravit vlastnosti prostředí"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "vybrat uživatele"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "přístupová práva (ACL)"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "role řízení přístupu"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "upravit ACL role"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "všechny kategorie"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "resetovat ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "tato úroveň"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "tento objekt"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "kompletní podstrom"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "kompletní podstrom (neresetovatelné)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "nahoru"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "dolů"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "smazat"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "pro tuto kategorii není nastaven žádný ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL pro tyto objekty: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "upravit ACL kategorie"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "resetovat ACL kategorie"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "upravit ACL pro '%s' v rozsahu '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "všechny objekty v současném podstromu"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "objekt v používání"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Tuto roli není možné odstranit, protože je využívána následujícími objekty:"
+msgstr "Tuto roli není možné odstranit, protože je využívána následujícími objekty:"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "role"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "role řízení přístupu"
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "oprávnění"
 
@@ -3380,7 +3151,7 @@ msgstr "oprávnění"
 msgid "List of acls"
 msgstr "seznam ACL"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "ACL"
@@ -3398,9 +3169,9 @@ msgid "ACL Templates"
 msgstr "šablony ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
-msgstr "skupiny objektů"
+msgstr "objekt „skupiny“"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:37
 msgid "Manage object groups"
@@ -3418,59 +3189,68 @@ msgstr "šablony"
 msgid "Windows Install"
 msgstr "instalace OS MS Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "telefonní fronta"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "terminál"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "aplikace"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "pracovní stanice s OS MS Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "zařízení"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "po spuštění"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "systémy"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "souhrn FAI (plně automatizované instalace)"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr "Argonaut klient"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "telefonní fronta"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "aplikace"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Tyto systémy jsou již nastavovány jinými skupinami objektů a nelze je proto "
-"přidat:"
+msgstr "Tyto systémy jsou již nastavovány jinými skupinami objektů a nelze je proto přidat:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3480,8 +3260,7 @@ msgstr "informace"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"V jediné skupině objektů nemůžete kombinovat terminály a pracovní stanice!"
+msgstr "V jediné skupině objektů nemůžete kombinovat terminály a pracovní stanice!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3495,7 +3274,7 @@ msgstr "Můžete zkombinovat nejvýše dva různé typy objektů!"
 msgid "Object group generic"
 msgstr "skupinu objektu – obecné"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "člen"
 
@@ -3524,40 +3303,34 @@ msgstr "odebrat skupinu objektu"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"Zásuvný modul '%s' nelze připravit, protože se nezdařilo najít jeho definici "
-"– zkontrolujte prosím Váš soubor s nastaveními."
+msgstr "Zásuvný modul '%s' nelze připravit, protože se nezdařilo najít jeho definici – zkontrolujte prosím Váš soubor s nastaveními."
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Průběh mazání byl přerušen zásuvným modulem '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "odkazy"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "položky seznamu je možné řadit"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "upravit tuto položku"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "smazat tuto položku"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "v"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "připojeno"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "chyba v XML"
 
@@ -3601,29 +3374,29 @@ msgstr "typ"
 msgid "Arguments"
 msgstr "argumenty"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr "Během vytváření této stránky ohlásil interpret PHP několik chyb!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr "zaslat hlášení o chybě vývojářům FusionDirectory"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "zaslat hlášení o chybě"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "přepnout informace"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "vnitřní chyba"
 
@@ -3633,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Požadovaný kanál neexistuje! Prosím kontaktujte svého správce systémů."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "zobrazovat role"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Nejste oprávněn(a) vytvořit snímek %s."
@@ -3646,103 +3419,135 @@ msgstr "Nejste oprávněn(a) vytvořit snímek %s."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Nejste oprávněn(a) k obnovení %s ze snímku."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "skupina uživatelů"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "žádné"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "'%s' musí být menší než %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "'%s' musí být menší než %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Soubor nelze nahrát!"
+msgstr "Nelze přečíst nahraný soubor: %s"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Certifikát je prázdný!"
+msgstr "soubor je prázdný"
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "soubor nebyl nenalezen"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "soubor není čitelný"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "načíst znovu"
+msgstr "nahrát"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "dolů"
+msgstr "stažení"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr "Fotografii uživatele nelze uložit – FusionDirectory k tomu potřebuje, aby byl nainstalován balíček 'php5-imagick'!"
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "název objektu"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3764,7 +3569,7 @@ msgstr "Vyberte pro vypsání objektů, které mají zapnuto '%s'."
 msgid "Select to search within subtrees"
 msgstr "zvolte pro vyhledávání i v podstromech"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "hledat v podstromech"
@@ -3875,12 +3680,12 @@ msgstr "informace o spojení"
 #: include/class_msgPool.inc:220
 #, php-format
 msgid "Cannot connect to %s database!"
-msgstr "Nedaří se připojení k databázi %s!"
+msgstr "Nelze se připojit k databázi %s!"
 
 #: include/class_msgPool.inc:240
 #, php-format
 msgid "Cannot select %s database!"
-msgstr "Nelze vybrat databázi %s!"
+msgstr "Databázi %s nelze zvolit!"
 
 #: include/class_msgPool.inc:250
 #, php-format
@@ -3890,124 +3695,123 @@ msgstr "není určen server %s!"
 #: include/class_msgPool.inc:270
 #, php-format
 msgid "Cannot query %s database!"
-msgstr "nedaří se klást dotazy do databáze %s!"
+msgstr "Nedaří se dotazovat do databáze %s!"
 
 #: include/class_msgPool.inc:280
 #, php-format
 msgid "The field '%s' contains a reserved keyword!"
-msgstr ""
-"Pole '%s' obsahuje vyhrazené klíčové slovo (použijte prosím něco jiného)!"
+msgstr "Pole '%s' obsahuje vyhrazené klíčové slovo (použijte prosím něco jiného)!"
 
 #: include/class_msgPool.inc:292
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "Příkaz určený jako háček %s pro zásuvný modul '%s' neexistuje!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "Příkaz '%s' není platný!"
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "'%s' příkaz (%s) pro zásuvný modul %s není správný!"
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "'%s' příkaz pro zásuvný modul %s není správný!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "'%s' příkaz (%s) není správný!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
+#, php-format
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "'%s' příkaz (%s) pro zásuvný modul %s není správný!"
+
+#: include/class_msgPool.inc:334
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "Nedaří se spustit příkaz '%s'!"
 
-#: include/class_msgPool.inc:331
-#, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Nedaří se spustit příkaz '%s' (%s) pro zásuvný modul %s!"
-
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Nedaří se spustit příkaz '%s' pro zásuvný modul %s!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Nedaří se spustit příkaz '%s' (%s)!"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Nedaří se spustit příkaz '%s' (%s) pro zásuvný modul %s!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Hodnota '%s' je příliš vysoká!"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' musí být menší než %s!"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Hodnota '%s' je příliš nízká!"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' musí být %d a větší!"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' závisí na '%s' – zadejte prosím obě hodnoty!"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "V systému již existuje položka s atributem '%s'!"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Pole '%s' nemůže být prázdné!"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "ukázka"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "pole '%s' obsahuje nepovolené znaky"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' není dovoleno:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' nejsou dovolené!"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "pole '%s' obsahuje nepovolené znaky!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Chybějící rozšíření PHP %s!"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4020,11 +3824,10 @@ msgstr "Chybějící rozšíření PHP %s!"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "zrušit"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4032,318 +3835,307 @@ msgstr "zrušit"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "použít"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "uložit"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "přidat %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "smazat %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "nastavit"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "nastavit %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "upravit…"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "upravit %s…"
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "zpět"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tento účet nemá platná rozšíření %s!"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr "Tento účet má povolena nastavení %s. Zakázat je můžete kliknutím níže."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Tento účet má vytvořena nastavení pro %s. Pokud je chcete odebrat, musíte "
-"ale nejprve odebrat nastavení pro %s!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Tento účet má vytvořena nastavení pro %s. Pokud je chcete odebrat, musíte ale nejprve odebrat nastavení pro %s!"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Tento účet má deaktivována nastavení pro %s. Zapnout je můžete kliknutím "
-"níže."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Tento účet má deaktivována nastavení pro %s. Zapnout je můžete kliknutím níže."
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Tento účet má deaktivována nastavení pro %s. Zapnout je ale můžete teprve "
-"poté, co přidáte nastavení pro %s!"
+msgstr "Tento účet má deaktivována nastavení pro %s. Zapnout je ale můžete teprve poté, co přidáte nastavení pro %s!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "přidat nastavení pro %s"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "odebrat nastavení pro %s"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "pro změnu informací v tomto dialogu klikněte na 'upravit'"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "leden"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "únor"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "březen"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "duben"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "květen"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "červen"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "červenec"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "srpen"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "září"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "říjen"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "listopad"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "prosinec"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "neděle"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "pondělí"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "úterý"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "středa"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "čtvrtek"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "pátek"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "sobota"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr "Operace v databázi se nezdařila!"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "operace čtení"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "operace přidání"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "operace upravování"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "operace smazání"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "operace hledání"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "ověření"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s selhalo!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "Operace v LDAPu selhala!"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "Nahrání selhalo!"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Nahrání selhalo: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Selhání komunikace se službou infrastruktury!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Selhání komunikace se službou infrastruktury: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "toto '%s' je stále používáno objektem: %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Toto '%s' je stále používáno."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "toto '%s' je stále používáno následujícími objekty: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Soubor '%s' neexistuje!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Soubor '%s' nelze číst!"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Do souboru '%s' nelze zapisovat!"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"Hodnota '%s' v tuto chvíli buď není nastavena, nebo je neplatná – "
-"překontrolujte prosím Váš soubor s nastaveními!"
+msgstr "Hodnota '%s' v tuto chvíli buď není nastavena, nebo je neplatná – překontrolujte prosím Váš soubor s nastaveními!"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Soubor '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Složku '%s' nelze vytvořit!"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Složku '%s' nelze smazat!"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "kontroluji, zda je podporováno: %s"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Nainstalovat a aktivovat modul PHP %s."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr ""
-"Nelze připravit třídu '%s'! Možná ve Vaší instalaci FusionDirectory chybí "
-"příslušný zásuvný modul?"
+msgstr "Nelze připravit třídu '%s'! Možná ve Vaší instalaci FusionDirectory chybí příslušný zásuvný modul?"
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
-msgstr ""
-"Nově zadaná hodnota základu není platná a proto je stále používána předchozí!"
+msgstr "Nově zadaná hodnota základu není platná a proto je stále používána předchozí!"
 
 #: include/exporter/class_cvsExporter.inc:92
 msgid "CSV"
-msgstr ""
+msgstr "CSV"
 
 #: include/exporter/class_PDF.php:62
 msgid "Page"
@@ -4351,115 +4143,111 @@ msgstr "stránka"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr ""
-"Není možné exportovat do formátu PDF: není nainstalována potřebná knihovna."
+msgstr "Není možné exportovat do formátu PDF: není nainstalována potřebná knihovna."
 
 #: include/exporter/class_pdfExporter.inc:197
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "chyba filtru"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "Filtr je neúplný!"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"'%s' není deklarován ve Vašem konfiguračním souboru. Zásuvný modul nelze "
-"spustit!"
+msgstr "'%s' není deklarován ve Vašem konfiguračním souboru. Zásuvný modul nelze spustit!"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-msgstr ""
+msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "použít filtr"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Certifikát je prázdný!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr "Nemohu nahrát certifikát – podporovány je pouze typ PEM/DER!"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr "Nemohu získat informace pro certifikáty, které nejsou typu PEM!"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Nebyl nahrán žádný platný certifikát!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "zrušit vše"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "vložit"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "nemohu vložit"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Chybné XML ve fusiondirectory.conf: %s na řádku %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Nedaří se přihlášení do LDAPu. Kontaktujte prosím správce systémů."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "V nastavení chybí jeden či oba tyto parametry: sambaSID a sambaRidBase"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"Pořizování snímků je sice povolené, ale není nastavena potřebná proměnná "
-"'%s'."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "Pořizování snímků je sice povolené, ale není nastavena potřebná proměnná '%s'."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"Pořizování snímků je sice povolené, ale chybí modul pro jejich kompresi. "
-"Nainstalujte prosím '%s'."
+msgstr "Pořizování snímků je sice povolené, ale chybí modul pro jejich kompresi. Nainstalujte prosím '%s'."
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "všechny kategorie"
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "můj účet"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "kořen"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "potvrdit"
 
@@ -4472,202 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"Pro tento otisk není k dispozici odpovídající mechanizmus šifrování hesla!"
+msgstr "Pro tento otisk není k dispozici odpovídající mechanizmus šifrování hesla!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
-msgstr ""
-"Objekt byl mezitím změněn. Jeho uložením zahodíte všechny změny, které "
-"ostatní mezitím mohli udělat."
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr "Objekt byl mezitím změněn. Jeho uložením zahodíte všechny změny, které ostatní mezitím mohli udělat."
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "probíhá změna DN ACL"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
-msgstr "z"
+msgstr "od"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "všichni uživatelé"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "resetovat předchozí ACL"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "použít ACL určená v roli"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Pro tuto kategorii není nastaven žádný ACL!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Obsahuje ACL pro následující objekty: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "ACL kategorie"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "upravit ACL pro '%s' v rozsahu '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "zobrazit/skrýt pokročilá nastavení"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "vytvářet objekty"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "přesouvat objekty"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "mazat objekty"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "dát oprávnění i vlastníkovi"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "číst"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "zapisovat"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "celý objekt"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "neznámý typ / rozsah ACL '%s'!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Neznámá položka '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "role: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "neznámá role"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "obsahuje nastavení pro následující objekty: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "členové"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "nečinný"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "žádní členové"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "správa seznamů pro řízení přístupu (ACL)"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "ACL role"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "vybrat vše"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "vytvořeno (kým)"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "přejít do kořene všech oddělení"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "přejít o jedno oddělení výše"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "přejít do svého oddělení"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "domovské"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "znovunačtení seznamu"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "zkopírovat"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "vyjmout"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "vyjmout tuto položku"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "kopírovat tuto položku"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "obnovit ze snímků"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "exportovat seznam"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "obnovit ze snímku"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "vytvořit snímek"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "vytvořit nový snímek tohoto objektu"
 
@@ -4683,80 +4468,72 @@ msgstr "Byla zadán neplatná volba '%s'!"
 
 #: include/class_log.inc:120
 msgid "Specified objectType is empty or invalid!"
-msgstr ""
-"Jako objectType (typ objektu) buď nebylo zadáno nic, nebo nesprávná hodnota."
+msgstr "Jako objectType (typ objektu) buď nebylo zadáno nic, nebo nesprávná hodnota."
 
 #: include/class_timezone.inc:60
 #, php-format
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"Nastavení časové zóny '%s' ve Vašem fusiondirectory.conf není správné. Nelze "
-"spočítat posun časové zóny."
+msgstr "Nastavení časové zóny '%s' ve Vašem fusiondirectory.conf není správné. Nelze spočítat posun časové zóny."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "varování ohledně výkonu"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "Výkonnost LDAPu je špatná: poslední dotaz trval celých %.2fs!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Nedaří se automaticky vytvořit podstromy s RND '%s': nebyla nalezena "
-"potřebná třída objektů!"
+msgstr "Nedaří se automaticky vytvořit podstromy s RND '%s': nebyla nalezena potřebná třída objektů!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr "nedaří se automaticky vytvořit podstromy s RND '%s': není podporováno"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "při operaci na '%s' na LDAP serveru '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "při operaci na LDAP serveru '%s'"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "V systému chybí příkaz '%s'!"
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Toto není platné DN: '%s'. Celek pro import by měl začínat na 'dn: …' na "
-"řádku %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Toto není platné DN: '%s'. Celek pro import by měl začínat na 'dn: …' na řádku %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Došlo k chybě během importu dn: '%s', zkontrolujte prosím Váš LDIF soubor od "
-"řádku %s dále!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Došlo k chybě během importu dn: '%s', zkontrolujte prosím Váš LDIF soubor od řádku %s dále!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Opravte prosím výše zmíněnou chybu a znovunačtěte stránku."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "všechny objekty v této kategorii"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr "Formát nastavení se změnil. Spusťte prosím instalátor znovu."
 
@@ -4764,268 +4541,235 @@ msgstr "Formát nastavení se změnil. Spusťte prosím instalátor znovu."
 msgid "Please activate debugging for details!"
 msgstr "Pro získání dalších podrobností prosím zapněte režim ladění!"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Chystáte se smazat snímek '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "odebrat snímek"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "r-m-d, h:m:v"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"fatální chyba: není určeno umístění třídy – pro nápravu prosím spusťe '%s'"
+msgstr "fatální chyba: není určeno umístění třídy – pro nápravu prosím spusťe '%s'"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"fatální chyba: nelze vytvořit instanci třídy '%s' – pokuste se to napravit "
-"spuštěním '%s' --update-cache (na serveru) a restartujte svůj webový "
-"prohlížeč"
+msgstr "fatální chyba: nelze vytvořit instanci třídy '%s' – pokuste se to napravit spuštěním '%s' --update-cache (na serveru) a restartujte svůj webový prohlížeč"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "FATÁLNÍ: chyba při připojování do LDAPu. Server ohlásil '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Uživatelské jméno / UID není v rámci stromu LDAP jedinečné. "
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"Uživatelské jméno / UID není v rámci stromu LDAP jedinečné. Kontaktujte "
-"prosím svého správce systémů."
+msgstr "Uživatelské jméno / UID není v rámci stromu LDAP jedinečné. Kontaktujte prosím svého správce systémů."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
-msgstr ""
-"Nastala chyba při pokusu o přidání zámku. Nahlaste to prosím vývojářům!"
+msgstr "Nastala chyba při pokusu o přidání zámku. Nahlaste to prosím vývojářům!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"Nemohu vytvořit informaci o zamykání ve stromu LDAPu. Kontaktujte prosím "
-"svého správce systémů!"
+msgstr "Nemohu vytvořit informaci o zamykání ve stromu LDAPu. Kontaktujte prosím svého správce systémů!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server odpověděl: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Při pokusu o vyhrazení přístupu k objektu bylo nalezeno několik již "
-"existujících zámků. To by se nemělo stávat – probíhá jejich odstraňování."
+msgstr "Při pokusu o vyhrazení přístupu k objektu bylo nalezeno několik již existujících zámků. To by se nemělo stávat – probíhá jejich odstraňování."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit velikosti položek %d je překročen!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, "
-"zobrazit toto hlášení znovu"
+msgstr "nastavit novou hodnotu limitu %s a v případě, že ani to nebude stačit, zobrazit toto hlášení znovu"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "nastavit"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "neúplné"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "přesto pokračovat"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "přesto upravit"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "chystáte se upravit položky LDAPu %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "položek na stránku"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "Nelze zapsat do souboru s revizemi!"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr "Nelze číst ze souboru s revizemi!"
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' není dostupný. Namísto něho bude použit výchozí základ!"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "varování LDAPu"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"Nedaří se získat informace o schématech ze serveru. Schémata proto nelze "
-"ověřit!"
+msgstr "Nedaří se získat informace o schématech ze serveru. Schémata proto nelze ověřit!"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Používá se k ukládání informací jednotlivých účtů."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Používá se k uzamčení právě upravovaných položek, aby se zabránilo vícero "
-"(vzájemně si vadícím) úpravám naráz."
+msgstr "Používá se k uzamčení právě upravovaných položek, aby se zabránilo vícero (vzájemně si vadícím) úpravám naráz."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Chybí nezbytně nutná třída objektů '%s'!"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Chybí volitelná třída objektů '%s'!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Neshoda ve verzích požadovaných tříd objektů %s' (!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "dostupné třídy"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"V kroku 'nastavení LDAPu' jste vybrali „skupiny dle normy rfc2307bis“, ale "
-"ve Vašich schématech to není podporováno."
+msgstr "V kroku 'nastavení LDAPu' jste vybrali „skupiny dle normy rfc2307bis“, ale ve Vašich schématech to není podporováno."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"aby bylo možné použít skupiny dle normy rfc2307bis, musí být třída objektů "
-"'posixGroup' POMOCNOU"
+msgstr "aby bylo možné použít skupiny dle normy rfc2307bis, musí být třída objektů 'posixGroup' POMOCNOU"
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Vaše schéma je nastaveno tak, aby podporovalo skupiny dle rf2307bis, ale "
-"tuto volbu jste v kroku 'nastavení LDAPu' vypnuli."
+msgstr "Vaše schéma je nastaveno tak, aby podporovalo skupiny dle rf2307bis, ale tuto volbu jste v kroku 'nastavení LDAPu' vypnuli."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
-msgstr ""
-"třída (objectClass) objektu 'posixGroup' musí být „strukturální“ (STRUCTURAL)"
+msgstr "třída (objectClass) objektu 'posixGroup' musí být „strukturální“ (STRUCTURAL)"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Příkaz '%s', zadaný jako POSTMODIFY (spusť po dokončení úpravy) pro zásuvný "
-"modul '%s' zdá se neexistuje."
+msgstr "Příkaz '%s', zadaný jako POSTMODIFY (spusť po dokončení úpravy) pro zásuvný modul '%s' zdá se neexistuje."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Není k dispozici volné ID:"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "Neznámá metoda idAllocation (přiřazování ID)!"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Nelze vytvořit položku sambaUnixIdPool!"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "Identifikátor sambaUnixIdPool není jedinečný!"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "Není k dispozici ID!"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "překročen maximální počet neúspěšných pokusů!"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "Není k dispozici volné ID – není co přidělit!"
 
 #: ihtml/themes/default/logout.tpl.c:2
 msgid "Your FusionDirectory session has expired!"
-msgstr ""
-"Vaše relace ve FusionDirectory byla automaticky ukončena po Vaší delší "
-"neaktivitÄ›!"
+msgstr "Vaše relace ve FusionDirectory byla automaticky ukončena po Vaší delší neaktivitě!"
 
 #: ihtml/themes/default/logout.tpl.c:5
 msgid ""
 "The last interaction with the FusionDirectory web interface has been some "
 "time ago in the past. For security reasons, the session has been closed. To "
 "continue with administrative tasks, please sign in again."
-msgstr ""
-"Na základě toho, že jste v předchozí relaci již dlouho nic neudělali, se "
-"zdá, že jste se jen zapomněl(a) odhlásit. Z bezpečnostních důvodů byla proto "
-"relace automaticky ukončena. Pokud chcete ve správě pokračovat, prosím "
-"přihlaste se znovu."
+msgstr "Na základě toho, že jste v předchozí relaci již dlouho nic neudělali, se zdá, že jste se jen zapomněl(a) odhlásit. Z bezpečnostních důvodů byla proto relace automaticky ukončena. Pokud chcete ve správě pokračovat, prosím přihlaste se znovu."
 
 #: ihtml/themes/default/logout.tpl.c:8
 msgid "Sign in again"
@@ -5039,9 +4783,7 @@ msgstr "přihlašovací obrazovka"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Zadejte prosím své uživatelské jméno a heslo pro přihlášení do správy "
-"systémů tohoto místa."
+msgstr "Zadejte prosím své uživatelské jméno a heslo pro přihlášení do správy systémů tohoto místa."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5074,7 +4816,6 @@ msgstr "pro přihlášení klikněte sem"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5084,6 +4825,7 @@ msgstr "pro přihlášení klikněte sem"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "filtr"
 
@@ -5095,22 +4837,15 @@ msgstr "byl zjištěn konflikt mezi relacemi"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Pravděpodobně se pokoušíte otevřít další relaci ve stejném prohlížeči, což z "
-"technických důvodů není možné. Pokud přesto potřebujete více relací naráz "
-"(například k přihlášení se pod jiným účtem), použijte více prohlížečů (napr. "
-"IE a Mozillu). Nyní ale tuto relaci ukončete kliknutím na 'odhlášení'."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Pravděpodobně se pokoušíte otevřít další relaci ve stejném prohlížeči, což z technických důvodů není možné. Pokud přesto potřebujete více relací naráz (například k přihlášení se pod jiným účtem), použijte více prohlížečů (napr. IE a Mozillu). Nyní ale tuto relaci ukončete kliknutím na 'odhlášení'."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Ignorováním (a pokračováním v tom co děláte) změníte/zničíte v tuto chvíli "
-"upravovaná data. Raději tedy zavřete všechna okna prohlížeče, ve kterých "
-"máte FusionDirectory spuštěn a přihlaste se znovu."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Ignorováním (a pokračováním v tom co děláte) změníte/zničíte v tuto chvíli upravovaná data. Raději tedy zavřete všechna okna prohlížeče, ve kterých máte FusionDirectory spuštěn a přihlaste se znovu."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5142,19 +4877,15 @@ msgstr "pro zaslání odkazu pro vyresetování klikněte sem"
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
-msgstr ""
-"pokud pro Vás žádný z výše uvedených způsobů není použitelný, kontaktujte "
-"pro změnu Vašeho hesla svého správce systémů"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr "pokud pro Vás žádný z výše uvedených způsobů není použitelný, kontaktujte pro změnu Vašeho hesla svého správce systémů"
 
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Tento dialog umožňuje jednoduše si změnit heslo. Zadejte (dvakrát) nové "
-"heslo do políček níže a klikněte na 'změnit'."
+msgstr "Tento dialog umožňuje jednoduše si změnit heslo. Zadejte (dvakrát) nové heslo do políček níže a klikněte na 'změnit'."
 
 #: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
@@ -5166,9 +4897,9 @@ msgstr "nové heslo znovu"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr "odolnost hesla"
 
@@ -5200,15 +4931,12 @@ msgstr "Vaše heslo bylo úspěšně změněno."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr ""
-"Do políčka níže zadejte svou e-mailovou adresu a klikněte na  'změnit'."
+msgstr "Do políčka níže zadejte svou e-mailovou adresu a klikněte na  'změnit'."
 
 #: ihtml/themes/default/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr ""
-"=> zadejte svou e-mailovou adresu v dlouhém formátu, příklad : Jan Novák => "
-"jan.novak@vase_domena.cz"
+msgstr "=> zadejte svou e-mailovou adresu v dlouhém formátu, příklad : Jan Novák => jan.novak@vase_domena.cz"
 
 #: ihtml/themes/default/recovery.tpl.c:95
 msgid ""
@@ -5237,20 +4965,15 @@ msgstr ""
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"Nezapomeňte zkontrolovat odkazy na ostatní objekty – např. zda stále "
-"existuje zvolená tiskárna."
+msgstr "Nezapomeňte zkontrolovat odkazy na ostatní objekty – např. zda stále existuje zvolená tiskárna."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
-msgstr ""
-"Není k dispozici žádný snímek, ze kterého by bylo možné provést obnovu."
+msgstr "Není k dispozici žádný snímek, ze kterého by bylo možné provést obnovu."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Vyberte snímek ze kterého provedena obnova. Tu poté spusťte kliknutím na "
-"ikonu složky."
+msgstr "Vyberte snímek ze kterého provedena obnova. Tu poté spusťte kliknutím na ikonu složky."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5261,17 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Tímto postupem bude vytvořen snímek stavu zvoleného objektu. Ten bude uložen "
-"v k tomu určené větvi Vašeho LDAP adresáře a může být použit pro obnovení."
+msgstr "Tímto postupem bude vytvořen snímek stavu zvoleného objektu. Ten bude uložen v k tomu určené větvi Vašeho LDAP adresáře a může být použit pro obnovení."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Pamatujte, že položky databáze, nastavení DNS a případné definice zón v "
-"serverových rozšířeních nebudou součástí snímku."
+msgstr "Pamatujte, že položky databáze, nastavení DNS a případné definice zón v serverových rozšířeních nebudou součástí snímku."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5286,18 +5005,14 @@ msgstr "důvod pořízení tohoto snímku (informace pro Vás)"
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "FusionDirectory to get your data back."
-msgstr ""
-"Prosím dobře si rozmyslete, zda to opravdu chcete udělat, protože provedené "
-"změny pak už nebude možné vzít zpět."
+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)!"
 
 #: ihtml/themes/default/simple-remove.tpl.c:8
 #: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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), klikněte na 'smazat'. V opačném případě celou "
-"akci zrušte kliknutím na 'zrušit'."
+msgstr "Tedy – pokud jste si jist(a), stiskněte 'smazat'. V opačném případě operaci zrušte pomocí 'zrušit'."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5308,11 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Pokud se domníváte, že položku nikdo jiný v tuto chvíli neupravuje a proto "
-"by neměla být uzamčena, došlo k tomu nejspíš tak, že někdo zavřel okno "
-"prohlížeče ve chvíli, kdy ji upravoval. V takovém případě zamčení překonejte "
-"kliknutím na 'přesto upravit'."
+msgstr "Pokud se domníváte, že položku nikdo jiný v tuto chvíli neupravuje a proto by neměla být uzamčena, došlo k tomu nejspíš tak, že někdo zavřel okno prohlížeče ve chvíli, kdy ji upravoval. V takovém případě zamčení překonejte kliknutím na 'přesto upravit'."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5320,15 +5031,11 @@ msgstr "pouze pro čtení"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"Omezování velikosti napomáhá k zlepšení odezvy LDAPu a chrání server před "
-"přílišným zatížením. Nejjednodušším způsobem, jak zacházet s velkými "
-"databázemi bez dlouhých odezev, je omezit hledání na menší hodnoty a pro "
-"získávání položek, které chcete, využívat filtry."
+msgstr "Omezování velikosti napomáhá k zlepšení odezvy LDAPu a chrání server před přílišným zatížením. Nejjednodušším způsobem, jak zacházet s velkými databázemi bez dlouhých odezev, je omezit hledání na menší hodnoty a pro získávání položek, které chcete, využívat filtry."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5336,16 +5043,13 @@ msgstr "zvolte prosím, jak reagovat během této relace"
 
 #: ihtml/themes/default/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignorovat tuto chybu a zobrazit všechny položky, které LDAP server poskytne"
+msgstr "ignorovat tuto chybu a zobrazit všechny položky, které LDAP server poskytne"
 
 #: ihtml/themes/default/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"Ignorovat tuto chybu a zobrazit všechny položky, které nejsou větší než "
-"zadaný limit – jako náhradu si vystačím s filtry."
+msgstr "Ignorovat tuto chybu a zobrazit všechny položky, které nejsou větší než zadaný limit – jako náhradu si vystačím s filtry."
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5413,18 +5117,11 @@ msgstr "přihlášen(a):"
 msgid "Session expires in %d!"
 msgstr "Relace vyprší za %d!"
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "hlavní nabídka FusionDirectory"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Může být využíváno vícero skupinami. Dobře si prosím rozmyslete, zda to "
-"opravdu chcete udělat, protože FusionDirectory pak už nebude moci vzít "
-"provedené změny zpět."
+msgstr "Může být využíváno vícero skupinami. Dobře si prosím rozmyslete, zda to opravdu chcete udělat, protože FusionDirectory pak už nebude moci vzít provedené změny zpět."
 
 #: ihtml/themes/default/logout-close.tpl.c:2
 msgid "Your FusionDirectory session has been closed!"
@@ -5434,9 +5131,7 @@ msgstr "Vaše relace ve FusionDirectory byla ukončena!"
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Zavřete prosím okno webového prohlížeče a vyčistěte jeho paměť hesel – "
-"zabráníte tak tomu, aby se pak případně někdo jiný přihlásil jako Vy."
+msgstr "Zavřete prosím okno webového prohlížeče a vyčistěte jeho paměť hesel – zabráníte tak tomu, aby se pak případně někdo jiný přihlásil jako Vy."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5444,19 +5139,17 @@ msgstr "Změňte si své heslo."
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Tento dialog Vám umožní jednoduše si změnit heslo. Do níže uvedených políček "
-"zadejte současné heslo, nové heslo (2x) a klikněte na 'změnit'."
+msgstr "Tento dialog Vám umožní jednoduše si změnit heslo. Do níže uvedených políček zadejte současné heslo, nové heslo (2x) a klikněte na 'změnit'."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "současné heslo"
 
@@ -5469,25 +5162,17 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr ""
-"Některé hodnoty musí být jedinečné v rámci celého adresáře, některé "
-"kombinace jsou zase nesmyslné. FusionDirectory zobrazuje příslušné atributy. "
-"Upravte prosím níže uvedené hodnoty tak, aby odpovídaly těmto pravidlům."
+msgstr "Některé hodnoty musí být jedinečné v rámci celého adresáře, některé kombinace jsou zase nesmyslné. FusionDirectory zobrazuje příslušné atributy. Upravte prosím níže uvedené hodnoty tak, aby odpovídaly těmto pravidlům."
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Pamatujte, že některé vlastnosti, jako například záznam o pořízených "
-"snímcích, nebudou zkopírovány!"
+msgstr "Pamatujte, že některé vlastnosti, jako například záznam o pořízených snímcích, nebudou zkopírovány!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr ""
-"Případně když během kopírováním či přesouvání objektu v rámci "
-"FusionDirectory smažete zdrojový objekt, může to vést k selhání vkládání "
-"objektů do nového umístění!"
+msgstr "Případně když během kopírováním či přesouvání objektu v rámci FusionDirectory smažete zdrojový objekt, může to vést k selhání vkládání objektů do nového umístění!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5509,8 +5194,7 @@ msgstr "ověřit heslo"
 
 #: setup/setup_ldap.tpl.c:2
 msgid "Please choose the LDAP user to be used by FusionDirectory"
-msgstr ""
-"Zvolte prosím účet uživatele v LDAPu který bude FusionDirectory využívat"
+msgstr "Zvolte prosím účet uživatele v LDAPu který bude FusionDirectory využívat"
 
 #: setup/setup_ldap.tpl.c:5
 msgid "Search"
@@ -5551,7 +5235,7 @@ msgstr "automaticky připojit základ stromu v LDAPu k DN účtu správce"
 
 #: setup/setup_ldap.tpl.c:50
 msgid "Admin password"
-msgstr "heslo účtu správce"
+msgstr "heslo správce"
 
 #: setup/setup_ldap.tpl.c:53
 msgid "Schema based settings"
@@ -5583,9 +5267,7 @@ msgstr "volnější pravidla pro pojmenovávání"
 
 #: setup/setup_config1.tpl.c:35
 msgid "Number base for people/groups"
-msgstr ""
-"od jaké hodnoty výše budou přidělovány číselné identifikátory uživatelských "
-"účtů a skupin"
+msgstr "od jaké hodnoty výše budou přidělovány číselné identifikátory uživatelských účtů a skupin"
 
 #: setup/setup_config1.tpl.c:41
 msgid "Password encryption algorithm"
@@ -5608,10 +5290,7 @@ msgid ""
 "FusionDirectory supports several encryption types for your passwords. "
 "Normally this is adjustable via user templates, but you can specify a "
 "default method to be used here, too."
-msgstr ""
-"FusionDirectory podporuje několik typů šifrování hesel. Který bude použit "
-"lze určovat v šablonách uživatelských účtů. Zde můžete určit, který bude "
-"výchozím."
+msgstr "FusionDirectory podporuje několik typů šifrování hesel. Který bude použit lze určovat v šablonách uživatelských účtů. Zde můžete určit, který bude výchozím."
 
 #: setup/setup_config1.tpl.c:68
 msgid ""
@@ -5619,42 +5298,28 @@ msgid ""
 "This is a workaround till OpenLDAP's in directory ACI's are    fully "
 "implemented. For this to work, we need the admin DN and the corresponding "
 "password."
-msgstr ""
-"Do doby, než OpenLDAP bude sám umět spravovat seznamy pro kontrolu přístupu "
-"(ACL), musí to za něho dělat FusionDirectory. Proto je třeba mu poskytnout "
-"neomezený přístup do LDAPu, zadáním DN jeho správce a příslušného hesla."
+msgstr "Do doby, než OpenLDAP bude sám umět spravovat seznamy pro kontrolu přístupu (ACL), musí to za něho dělat FusionDirectory. Proto je třeba mu poskytnout neomezený přístup do LDAPu, zadáním DN jeho správce a příslušného hesla."
 
 #: setup/setup_config1.tpl.c:71
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where "
 "FusionDirectory saves people and groups, including the way accounts get "
 "created. Check the values below if the fit your needs."
-msgstr ""
-"Některé ze základních parametrů LDAPu je možné poupravit – týká se to např. "
-"umístění účtů uživatelů a skupin, způsobu jejich vytváření. Prostudujte si "
-"níže uvedené hodnoty, zda odpovídají Vašim potřebám."
+msgstr "Některé ze základních parametrů LDAPu je možné poupravit – týká se to např. umístění účtů uživatelů a skupin, způsobu jejich vytváření. Prostudujte si níže uvedené hodnoty, zda odpovídají Vašim potřebám."
 
 #: setup/setup_config1.tpl.c:74
 msgid ""
 "FusionDirectory has modular support for several mail methods. These methods "
 "provide interfaces to users mailboxes and general handling    for quotas. "
 "You can choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"FusionDirectory podporuje více systémů správy elektronické pošty. Poskytuje "
-"rozhraní pro schránky uživatelů a obecnou správu kvót. Pokud odtud svou "
-"elektronickou poštu spravovat nechcete, můžete použít „výplňový“, nic "
-"nedělající zásuvný modul."
+msgstr "FusionDirectory podporuje více systémů správy elektronické pošty. Poskytuje rozhraní pro schránky uživatelů a obecnou správu kvót. Pokud odtud svou elektronickou poštu spravovat nechcete, můžete použít „výplňový“, nic nedělající zásuvný modul."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
-msgstr ""
-"Během kontroly LDAPu bude zjišťováno, zda zde existují případné běžně se "
-"vyskytující nedostatky, na které lze narazit při přechodu na správu LDAPu "
-"pomocí FusionDirectory. Pro docílení bezproblémového chodu služeb bude dobré "
-"odstranit níže uvedené problémy."
+msgstr "Během kontroly LDAPu bude zjišťováno, zda zde existují případné běžně se vyskytující nedostatky, na které lze narazit při přechodu na správu LDAPu pomocí FusionDirectory. Pro docílení bezproblémového chodu služeb bude dobré odstranit níže uvedené problémy."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -5690,19 +5355,14 @@ msgstr "přesunout skupiny do příslušného stromu"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Tento dialog umožňuje přesunout vícero skupin do příslušného stromu. Je tak "
-"možné zlepšit přehlednost služeb LDAPu."
+msgstr "Tento dialog umožňuje přesunout vícero skupin do příslušného stromu. Je tak možné zlepšit přehlednost služeb LDAPu."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"U této volby buďte opatrní! Na tyto skupiny se může odkazovat něco dalšího. "
-"Instalátor FusionDirectory nemůže odkazy přenést, takže pokud jsou použity, "
-"měli byste celou operaci zrušit."
+msgstr "U této volby buďte opatrní! Na tyto skupiny se může odkazovat něco dalšího. Instalátor FusionDirectory nemůže odkazy přenést, takže pokud jsou použity, měli byste celou operaci zrušit."
 
 #: setup/setup_migrate.tpl.c:32
 msgid "Move selected groups into this group tree"
@@ -5730,19 +5390,14 @@ msgstr "přesunout uživatele do příslušného stromu"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Tento dialog umožňuje přesunout vícero účtů uživatelů do příslušného stromu. "
-"Je tak možné zlepšit přehlednost služeb LDAPu."
+msgstr "Tento dialog umožňuje přesunout vícero účtů uživatelů do příslušného stromu. Je tak možné zlepšit přehlednost služeb LDAPu."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"U této volby buďte opatrní! Na tyto uživatele se může odkazovat něco "
-"dalšího. Instalátor FusionDirectory nemůže odkazy přenést, takže pokud jsou "
-"použity, měli byste celou operaci zrušit."
+msgstr "U této volby buďte opatrní! Na tyto uživatele se může odkazovat něco dalšího. Instalátor FusionDirectory nemůže odkazy přenést, takže pokud jsou použity, měli byste celou operaci zrušit."
 
 #: setup/setup_migrate.tpl.c:59
 msgid "Move selected users into this people tree"
@@ -5756,9 +5411,7 @@ msgstr "migrovat správcovské účty z GOsa 2.5"
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into "
 "FusionDirectory 1.0 useable accounts."
-msgstr ""
-"Tento dialog umožnuje migraci správcovských účtů z GOsa 2.5 na účty "
-"použitelné ve FusionDirectory 1.x.x."
+msgstr "Tento dialog umožnuje migraci správcovských účtů z GOsa 2.5 na účty použitelné ve FusionDirectory 1.x.x."
 
 #: setup/setup_migrate.tpl.c:107
 msgid "Abort"
@@ -5772,12 +5425,11 @@ msgstr "vytvořit nový správcovský účet pro FusionDirctory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"tento dialog automaticky přidá nového super správce do Vašeho LDAP stromu."
+msgstr "tento dialog automaticky přidá nového super správce do Vašeho LDAP stromu."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
-msgstr "uživatelské jméno"
+msgstr "ID uživatele"
 
 #: setup/setup_migrate.tpl.c:125
 msgid "Password (again)"
@@ -5788,10 +5440,7 @@ msgid ""
 "The listed departments are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of entries, select them "
 "and use the migrate button below."
-msgstr ""
-"Tato oddělení nejsou v tuto chvíli viditelná v uživatelském rozhraní "
-"FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na "
-"'migrovat'."
+msgstr "Tato oddělení nejsou v tuto chvíli viditelná v uživatelském rozhraní FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na 'migrovat'."
 
 #: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
 #: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
@@ -5799,34 +5448,26 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Náhled toho, co s vybranými položkami stane po migraci, lze získat z LDIFu "
-"po kliknutí na 'zobrazit změny'."
+msgstr "Náhled toho, co s vybranými položkami stane po migraci, lze získat z LDIFu po kliknutí na 'zobrazit změny'."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
 "The listed users are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of users, just select "
 "them and use the 'Migrate' button below."
-msgstr ""
-"Tito uživatelé nejsou v tuto chvíli viditelní přes uživatelské rozhraní "
-"FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na "
-"'migrovat'."
+msgstr "Tito uživatelé nejsou v tuto chvíli viditelní přes uživatelské rozhraní FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na 'migrovat'."
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Tato zařízení nejsou v tuto chvíli viditelní přes uživatelské rozhraní "
-"FusionDirectory. Ta, u kterých to není úmyslem prostě označte a klikněte na "
-"'migrovat'."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr "Tato zařízení nejsou v tuto chvíli viditelní přes uživatelské rozhraní FusionDirectory. Ta, u kterých to není úmyslem prostě označte a klikněte na 'migrovat'."
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "obnovit"
 
@@ -5835,20 +5476,14 @@ msgid ""
 "The listed services are currently invalid for the FusionDirectory version "
 "you are going to install. If you want to update a couple of service, just "
 "select them and use the 'Migrate' button below."
-msgstr ""
-"Tyto služby nejsou v tuto chvíli viditelné přes uživatelské rozhraní "
-"FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na "
-"'migrovat'."
+msgstr "Tyto služby nejsou v tuto chvíli viditelné přes uživatelské rozhraní FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na 'migrovat'."
 
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Tyto nabídky nejsou v tuto chvíli viditelné přes uživatelské rozhraní "
-"FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na "
-"'migrovat'."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr "Tyto nabídky nejsou v tuto chvíli viditelné přes uživatelské rozhraní FusionDirectory. Ty, u kterých to není úmyslem prostě označte a klikněte na 'migrovat'."
 
 #: setup/setup_feedback.tpl.c:2
 msgid "Feedback successfully send"
@@ -5868,11 +5503,9 @@ msgstr "poslat podnět(y) vývojářskému týmu FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
-msgstr ""
-"Pokud zaškrtnete tuto volbu, FusionDirectory se pokusí připojit na http://"
-"www.fusiondirectory.org a anonymně zde předat Vámi vyplněný formulář."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr "Pokud zaškrtnete tuto volbu, FusionDirectory se pokusí připojit na http://www.fusiondirectory.org a anonymně zde předat Vámi vyplněný formulář."
 
 #: setup/setup_feedback.tpl.c:26
 msgid "Did the setup procedure help you to get started?"
@@ -5912,7 +5545,7 @@ msgstr "verze FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:65
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
 #: setup/setup_feedback.tpl.c:68
 msgid "What kind of LDAP server(s) do you use?"
@@ -5931,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr "Které funkce FusionDirectory využíváte?"
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr "Jaké funkce byste rádi viděli v příštích verzích FusionDirectory?"
 
 #: setup/setup_feedback.tpl.c:83
@@ -5945,12 +5579,9 @@ msgstr "Prosím zvolte Vámi upřednostňovaný jazyk."
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"Nyní můžete zvolit výchozí jazyk. Volba 'automaticky' použije jazyk "
-"požadovaný webovým prohlížečem. Jednotliví uživatelé pak mohou mít "
-"individuálně nastaven i jiný jazyk."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "Nyní můžete zvolit výchozí jazyk. Volba 'automaticky' použije jazyk požadovaný webovým prohlížečem. Jednotliví uživatelé pak mohou mít individuálně nastaven i jiný jazyk."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -5964,27 +5595,27 @@ msgstr "zvolte upřednostňovanou časovou zónu"
 msgid "FusionDirectory core settings"
 msgstr "nastavení (samotného) FusionDirectory"
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "zapnout vyhrazování (zamykání) při úpravách"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr "zaznamenávat události ve FusionDirectory do syslogu"
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "vynucovat vypnutí parametru 'register_globals' v PHP"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "zobrazovat chyby v PHP"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "zakázáno"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "povoleno"
 
@@ -6005,10 +5636,7 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr ""
-"Zdá se, že toto je první spuštění FusionDirectory – není k dispozici "
-"jakékoli nastavení. Tento jednoduchý průvodce se pokusí pomoci Vám s jeho "
-"vytvořením."
+msgstr "Zdá se, že toto je první spuštění FusionDirectory – není k dispozici jakékoli nastavení. Tento jednoduchý průvodce se pokusí pomoci Vám s jeho vytvořením."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -6020,9 +5648,7 @@ msgstr "vytvoří základní nastavení pro jedinou organizaci"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr ""
-"pokusí se najít problémy, které by mohly existovat ve Vaší instalaci PHP a "
-"LDAPu"
+msgstr "pokusí se najít problémy, které by mohly existovat ve Vaší instalaci PHP a LDAPu"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
@@ -6042,9 +5668,7 @@ msgstr "Nalézt všechny případné chyby."
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr ""
-"provést migraci všech možných variant LDAP adresáře – než začnete, vždy si "
-"udělejte zálohu!"
+msgstr "provést migraci všech možných variant LDAP adresáře – než začnete, vždy si udělejte zálohu!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue..."
@@ -6056,11 +5680,7 @@ msgid ""
 "creating the file '/tmp/fusiondirectory.auth', containing the current "
 "session ID on the servers local filesystem. This can be done by executing "
 "the following command:"
-msgstr ""
-"Z bezpečnostních důvodů je třeba, abyste instalačnímu procesu prokázal(a) "
-"své oprávnění vytvořením souboru '/tmp/fusiondirectory.auth' na souborovém "
-"systému serveru, do kterého zapíšete ID této relace. Můžete tak učinit "
-"spuštěním tohoto příkazu (na serveru):"
+msgstr "Z bezpečnostních důvodů je třeba, abyste instalačnímu procesu prokázal(a) své oprávnění vytvořením souboru '/tmp/fusiondirectory.auth' na souborovém systému serveru, do kterého zapíšete ID této relace. Můžete tak učinit spuštěním tohoto příkazu (na serveru):"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -6108,11 +5728,9 @@ msgstr "ověření schémat selhalo"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"Nezdařilo se načíst žádné informace o schématech – celá kontrola tedy byla "
-"vynechána. Upravte oprávnění (ACL) ve svém LDAPu."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "Nezdařilo se načíst žádné informace o schématech – celá kontrola tedy byla vynechána. Upravte oprávnění (ACL) ve svém LDAPu."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
@@ -6150,7 +5768,7 @@ msgstr "název objektu"
 
 #: plugins/generic/references/contents.tpl.c:8
 msgid "Contents"
-msgstr "obsah"
+msgstr "obsah(uje)"
 
 #: plugins/generic/references/contents.tpl.c:11
 msgid "This object has no relationship to other objects."
@@ -6161,9 +5779,7 @@ msgstr "tento objekt nemá žádné propojení s dalšími objekty"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Vaše heslo bylo úspěšně změněno. Nezapomeňte ho změnit též ve všech "
-"aplikacích, které ho používají."
+msgstr "Vaše heslo bylo úspěšně změněno. Nezapomeňte ho změnit též ve všech aplikacích, které ho používají."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6176,9 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Pro změnu Vašeho hesla použijte pole níže. Změna nabude platnosti okamžitě. "
-"Prosím zapamatujte si nové heslo, protože jinak se nebudete moci přihlásit."
+msgstr "Pro změnu Vašeho hesla použijte pole níže. Změna nabude platnosti okamžitě. Prosím zapamatujte si nové heslo, protože jinak se nebudete moci přihlásit."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6186,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Změna hesla se týká též Vašeho ověřování vůči e-mailu, proxy, Sambě a "
-"unixovým službám."
+msgstr "Změna hesla se týká též Vašeho ověřování vůči e-mailu, proxy, Sambě a unixovým službám."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "Platnost vašeho hesla skončila. Prosím, nastavte si nové!"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
-msgstr "zopakujte nové heslo"
+msgstr "zopakování nového hesla"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "dialog pro změnu hesla"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "použít navržené"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "ruční zadání hesla"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "nastavit heslo"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "vymazat všechna pole"
 
@@ -6234,55 +5841,10 @@ msgstr "vymazat všechna pole"
 msgid "Your password hash method will not be changed!"
 msgstr "Způsob uložení Vašeho hesla nebyl změněn!"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "elektronické podpisy (certifikáty)"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "standardní certifikát"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "certifikát S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "certifikát typu PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "sériové číslo certifikátu"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "fotografie"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "odebrat fotografii"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "nastavení uživatele"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "příjmení"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "křestní jméno"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "odebrat heslo"
@@ -6291,59 +5853,17 @@ msgstr "odebrat heslo"
 msgid "Set new password"
 msgstr "nastavit nové heslo"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "osobní informace"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "změnit fotografii"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "název šablony"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "upřednostňovaný jazyk"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "soukromý telefon"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "způsob uložení hesla"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Může se přihlásit pouze z:"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP adresa nebo síť"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "organizační informace"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "číslo oddělení"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "číslo zaměstnance"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "fotografie"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "označení místnosti"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "fotografie uživatele"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "použijte prosím záložku 'telefon'"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "odebrat fotografii"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6360,23 +5880,6 @@ msgstr "zobrazovat skupiny Samby"
 msgid "Show mail groups"
 msgstr "zobrazovat e-mailové skupiny"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "zobrazit servery"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "zobrazit pracovní stanice"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr "zobrazit počítače s OS MS Windows"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "zobrazit terminály"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6395,15 +5898,6 @@ msgstr "název místa, které má být přidáno"
 msgid "Descriptive text for department"
 msgstr "popis oddělení"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "označit oddělení jako nezávislou administrativní jednotku"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "požadovaná operace je prováděna"
@@ -6412,9 +5906,7 @@ msgstr "požadovaná operace je prováděna"
 msgid ""
 "Your browser doesn't support iframes, please use this link to perform the "
 "requested operation."
-msgstr ""
-"Váš prohlížeč nepodporuje prvek „iframe“, proto pro provedení požadované "
-"operace klikněte na tento odkaz."
+msgstr "Váš webový prohlížeč nepodporuje prvek iframes – pro provedení požadované operace klikněte na tento odkaz."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6428,9 +5920,7 @@ msgstr "V tuto chvíli přesouváte/přejmenováváte toto oddělení."
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"Změna názvu oddělení (atribut 'ou' – organizační jednotka) či základu může "
-"rozbít nastavení ACL všechny objekty."
+msgstr "Změna názvu oddělení (atribut 'ou' – organizační jednotka) či základu může rozbít nastavení ACL všechny objekty."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6440,9 +5930,7 @@ msgstr "Tohle zatím ještě FusionDirectory neumí opravit."
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Předtím, než tuto akci potvrdíte, ujistěte se, že všechno proběhne jak má – "
-"a nejlépe ještě předtím pořiďte zálohu."
+msgstr "Předtím, než tuto akci potvrdíte, ujistěte se, že všechno proběhne jak má – a nejlépe ještě předtím pořiďte zálohu."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6487,20 +5975,14 @@ msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
 "check if your really want to do this since there is no way for "
 "FusionDirectory to get your data back."
-msgstr ""
-"Toto se týká 'všech' účtů, systémů a dalšího v tomto podstromu. Dobře si "
-"rozmyslete, zda to opravdu chcete udělat, protože pak již nebude možné vzít "
-"provedené změny zpět."
+msgstr "Toto se týká 'všech' účtů, systémů a dalšího v tomto podstromu. Dobře si rozmyslete, zda to opravdu chcete udělat, protože pak již nebude možné vzít provedené změny zpět."
 
 #: plugins/admin/departments/remove.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'."
+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'."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6530,9 +6012,7 @@ msgstr "probíhá aplikování šablony"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Aplikování šablony na vícero uživatelských účtů nahradí ty jejich atributy, "
-"které jsou definovány v šabloně."
+msgstr "Aplikování šablony na vícero uživatelských účtů nahradí ty jejich atributy, které jsou definovány v šabloně."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6547,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Při vytváření nového uživatelského účtu je možné použít šablony. Mnohé údaje "
-"pak budou vyplněny automaticky. Pokud nechcete použít šablonu, vyberte "
-"'žádná'."
+msgstr "Při vytváření nového uživatelského účtu je možné použít šablony. Mnohé údaje pak budou vyplněny automaticky. Pokud nechcete použít šablonu, vyberte 'žádná'."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6574,33 +6051,23 @@ msgstr "zobrazit uživatele se Samba účtem"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/remove.tpl.c:5
 msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for FusionDirectory to get your data back."
-msgstr ""
-"Toto se týká všech dat účtu, pravidel pro přístupy k systému, nastavení "
-"IMAPu a dalších nastavení tohoto uživatele. Dobře si rozmyslete, zda to "
-"opravdu chcete udělat, protože pak již nebude možné vzít provedené změny "
-"zpět."
+"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)!"
 
 #: plugins/admin/users/password.tpl.c:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Pro změnu hesla použijte políček níže. Změna se projeví okamžitě. Nové heslo "
-"si prosím zapamatujte, jinak se nebudete moci přihlásit."
+msgstr "Pro změnu hesla použijte políček níže. Změna se projeví okamžitě. Nové heslo si prosím zapamatujte, jinak se nebudete moci přihlásit."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "odolnost"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "dialog pro zadání hesla"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Vynutit změnu hesla při příštím přihlášení."
 
@@ -6633,8 +6100,7 @@ msgstr "název skupiny v POSIXu"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"ID jsou obvykle vytvářeny automaticky, chcete-li, můžete je zadat i ručně"
+msgstr "ID jsou obvykle vytvářeny automaticky, chcete-li, můžete je zadat i ručně"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6650,10 +6116,7 @@ msgstr "vynutit číselný identifikátor"
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Toto může být hlavní skupina pro některé uživatelské účty. Prosím dobře "
-"zvažte, zda to opravdu chcete udělat, protože pak už nebude možné vzít "
-"provedené změny zpět."
+msgstr "Toto může být hlavní skupina pro některé uživatelské účty. Prosím dobře zvažte, zda to opravdu chcete udělat, protože pak už nebude možné vzít provedené změny zpět."
 
 #: plugins/admin/groups/trust_machines.tpl.c:2
 #: plugins/admin/ogroups/trust_machines.tpl.c:2
@@ -6675,7 +6138,7 @@ msgstr "zobrazit všechny systémy tohoto oddělení"
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:17
 #: plugins/admin/ogroups/trust_machines.tpl.c:11
 msgid "Choose the department the search will be based on"
-msgstr "zvolte oddělení, ve kterém se bude vyhledávat"
+msgstr "vyberte oddělení ve kterém se bude hledat"
 
 #: plugins/admin/groups/trust_machines.tpl.c:14
 #: plugins/admin/ogroups/trust_machines.tpl.c:14
@@ -6685,7 +6148,7 @@ msgstr "zobrazit systémy, které odpovídají zadání"
 #: plugins/admin/groups/trust_machines.tpl.c:17
 #: plugins/admin/ogroups/trust_machines.tpl.c:17
 msgid "Regular expression for matching addresses"
-msgstr "regulární výraz pro vyhledání odpovídající adresy"
+msgstr "regulární výraz pro nalezení odpovídajících adres"
 
 #: plugins/admin/groups/generic.tpl.c:11
 #: plugins/admin/ogroups/generic.tpl.c:11
@@ -6734,7 +6197,7 @@ msgstr "zobrazit odpovídající objekty"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:23
 msgid "Regular expression for matching object names"
-msgstr "regulární výraz pro vyhledání objektů"
+msgstr "regulární výraz pro hledání objektů s odpovídajícími názvy"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:5
 msgid "Show department"
@@ -6752,6 +6215,11 @@ msgstr "zobrazit server"
 msgid "Show workstation"
 msgstr "zobrazit pracovní stanici"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr "zobrazit počítače s OS MS Windows"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "zobrazit terminál"
@@ -6816,11 +6284,14 @@ msgstr "název skupiny"
 msgid "Member objects"
 msgstr "členské objekty"
 
-#~ msgid "Multiple edit"
-#~ msgstr "vícenásobná úprava"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "zobrazit servery"
 
-#~ msgid "In all groups"
-#~ msgstr "ve všech skupinách"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "zobrazit pracovní stanice"
 
-#~ msgid "Not in all groups"
-#~ msgstr "nenachází se v žádné skupině "
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "zobrazit terminály"
diff --git a/locale/de/fusiondirectory.po b/locale/de.po
similarity index 67%
rename from locale/de/fusiondirectory.po
rename to locale/de.po
index 2e5947d767934378b353ec7b772601cd510c6969..57707b705cbad12f057ae700339c4492ab2be89e 100644
--- a/locale/de/fusiondirectory.po
+++ b/locale/de.po
@@ -1,59 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Alfred Schroeder <schroeder@GONICUS.de>, 2004
-# Benoit Mortier <benoit.mortier@opensides.be>, 2012
-# Cajus Pollmeier <pollmeier@gonicus.de>, 2004-2006,2008-2009
-# Jan Wenzel <jan.wenzel@gonicus.de>, 2004-2005,2008
-# Stefan Koehler <stefan.koehler@GONICUS.de>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/de/)\n"
-"Language: de\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "nein"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "ja"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Einrichtungsfehler"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "Lebenszeit der Sitzung muss ein numerischer Wert sein!"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "Die maximale LDAP-Abfragedauer muß ein numerischer Wert sein!"
 
@@ -74,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Dieser Schritt erlaubt es Ihnen, Ihre bevorzugte Sprache auszuwählen."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "LDAP-Inspektion"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Prüfe auf Wurzelobjekt"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "Prüfe Objekt-Klassen des Wurzelobjektes"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "Prüfe Berechtigungen auf die LDAP-Datenbank"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Prüfe auf unsichtbare Abteilungen"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Prüfe auf unsichtbare Benutzer"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Prüfe auf Superadministrator"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Prüfe auf Benutzer ausserhalb des Benutzerbaums"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Prüfe auf Gruppen ausserhalb des Gruppenbaums"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Prüfe auf doppelte UID Nummern"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Prüfe auf doppelte GID Nummern"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "Prüfe auf alte USB-Geräte"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "Prüfe auf alte Service-Einträge"
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "Prüfe auf alte Menü-Einträge"
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "LDAP-Abfrage fehlgeschlagen."
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Wahrscheinlich fehlt das Wurzelobjekt."
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -185,59 +178,56 @@ msgstr "Wahrscheinlich fehlt das Wurzelobjekt."
 msgid "Warning"
 msgstr "Warnung"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Es wurden %s doppelte Werte für das Attribute 'uidNumber' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Es wurden %s doppelte Werte für das Attribute 'gidNumber' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
-msgstr ""
-"Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
+msgstr "Es wurden %s Gruppen ausserhalb des konfigurierten Baums '%s' gefunden."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Verschieben"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
-msgstr ""
-"Es wurde(n) %s Benutzer ausserhalb des konfigurierten Baums '%s' gefunden."
+msgstr "Es wurde(n) %s Benutzer ausserhalb des konfigurierten Baums '%s' gefunden."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
@@ -245,51 +235,51 @@ msgstr "Fehlgeschlagen"
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-"Der angegebene Benutzer '%s' hat keinen Vollzugriff auf Ihre LDAP-Datenbank."
+msgstr "Der angegebene Benutzer '%s' hat keinen Vollzugriff auf Ihre LDAP-Datenbank."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Migrieren"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Migrationsfehler"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Die Abteilung '%s' kann nicht migriert werden:"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -297,239 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Anlegen"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Benutzer"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Gruppen"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Kann ACL für Benutzer '%s' nicht hinzufügen:"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Eingabefehler"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Passwortfehler"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "Die angegebenen Passwörter stimmen nicht überein!"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "Geben Sie eine gültige Benutzer ID an!"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Fehler"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"Hinzufügen eines administrativen Benutzers fehlgeschlagen: Objekt '%s' "
-"existiert bereits!"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "Hinzufügen eines administrativen Benutzers fehlgeschlagen: Objekt '%s' existiert bereits!"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "Kann Benutzer nicht in die geforderte Abteilung verschieben!"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "Die Gruppe wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "an"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "Aktualisiere ebenfalls die folgenden Referenzen"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "Der Benutzer wird verschoben von"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "Die folgenden Referenzen werden aktualisiert"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"Das LDAP Wurzelobjekt fehlt. Es wird für den Betrieb des LDAP-Dienstes "
-"benötigt."
+msgstr "Das LDAP Wurzelobjekt fehlt. Es wird für den Betrieb des LDAP-Dienstes benötigt."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Versuche, das Wurzelobjekt zu erzeugen"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
-msgstr ""
-"Das Wurzelobjekt konnte nicht erstellt werden, Sie sollten dies manuell "
-"erledigen."
+msgstr "Das Wurzelobjekt konnte nicht erstellt werden, Sie sollten dies manuell erledigen."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Bitte überprüfen Sie Ihre Installation."
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert "
-"werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
+msgstr "Die strukturelle Objekt-Typ Ihres Wurzel-Objektes kann nicht konvertiert werden. Bitte fügen Sie die Objekt-Klasse '%s' manuell hinzu."
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Kopieren von '%s' nach '%s' fehlgeschlagen:"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "%s Geräte müssen migriert werden."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "Hinzufügen von '%s' ist fehlgeschlagen: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "Aktualisierung von '%s' ist fehlgeschlagen: %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Es müssen %s Dienste migriert werden."
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -537,13 +505,10 @@ msgstr "Hinzufügen"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Entfernen"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Es müssen %s Menüs migriert werden."
@@ -655,38 +620,27 @@ msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"register_globals ist ein PHP-Mechanismus, welcher alle globalen Variablen "
-"für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein."
+msgstr "register_globals ist ein PHP-Mechanismus, welcher alle globalen Variablen für Skripte direkt zugänglich macht. Dies kann ein Sicherheitsrisiko sein."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr ""
-"Suchen Sie nach 'register_globals' in Ihrer php.ini und setzen Sie es auf "
-"'Off'."
+msgstr "Suchen Sie nach 'register_globals' in Ihrer php.ini und setzen Sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
-"PHP verwendet diese Einstellungen für den Garbage Collector, um alte "
-"Sessions zu entfernen."
+msgstr "PHP verwendet diese Einstellungen für den Garbage Collector, um alte Sessions zu entfernen."
 
 #: setup/class_setupStep_Checks.inc:176
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Wenn Sie diesen Wert auf einen Tag setzen, wird dies vermeiden, dass Sie die "
-"Sitzung und den zugehörigen Cookie verlieren, bevor diese tatsächlich ihre "
-"Gültigkeit verlieren."
+msgstr "Wenn Sie diesen Wert auf einen Tag setzen, wird dies vermeiden, dass Sie die Sitzung und den zugehörigen Cookie verlieren, bevor diese tatsächlich ihre Gültigkeit verlieren."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Suchen Sie in Ihrer php.ini nach 'session.gc_maxlifetime' und setzen Sie es "
-"auf 84600 oder höher."
+msgstr "Suchen Sie in Ihrer php.ini nach 'session.gc_maxlifetime' und setzen Sie es auf 84600 oder höher."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -701,9 +655,7 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"Suchen Sie in Ihrer php.ini nach 'session.auto_start' und setzen Sie es auf "
-"'Off'."
+msgstr "Suchen Sie in Ihrer php.ini nach 'session.auto_start' und setzen Sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:193
 msgid ""
@@ -720,15 +672,11 @@ msgstr ""
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie "
-"diese auf 'off', um die Leistung zu erhöhen."
+msgstr "Diese Einstellung beeinflusst die Verarbeitung der Ausgabe. Stellen Sie diese auf 'off', um die Leistung zu erhöhen."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr ""
-"Suchen Sie in Ihrer php.ini nach 'implicit_flush' und setzen Sie es auf "
-"'Off'."
+msgstr "Suchen Sie in Ihrer php.ini nach 'implicit_flush' und setzen Sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:209
 msgid "The Execution time should be at least 30 seconds."
@@ -736,37 +684,29 @@ msgstr "Die Ausführungszeit sollte mindestens 30 Sekunden betragen."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf "
-"'30' oder höher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Suchen Sie in Ihrer php.ini nach 'max_execution_time' und setzen Sie es auf '30' oder höher."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Erhöhen Sie die Sicherheit Ihres Servers, indem Sie expose_php auf 'off' "
-"setzen. PHP wird in dieser Einstellung keine Informationen über Ihren "
-"laufenden Server senden."
+msgstr "Erhöhen Sie die Sicherheit Ihres Servers, indem Sie expose_php auf 'off' setzen. PHP wird in dieser Einstellung keine Informationen über Ihren laufenden Server senden."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr ""
-"Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
+msgstr "Suchen Sie in Ihrer php.ini nach 'expose_php' und setzen Sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Erhöhen Sie die Leistung des Servers, indem sie magic_quotes_gpc auf 'off' "
-"stellen."
+msgstr "Erhöhen Sie die Leistung des Servers, indem sie magic_quotes_gpc auf 'off' stellen."
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen "
-"Sie es auf 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Suchen Sie in Ihrer php.ini nach 'zend.ze1_compatibility_mode' und setzen Sie es auf 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -846,9 +786,7 @@ msgstr "Abschluß - Schreiben der Konfigurationsdatei"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"Ihre Konfigurationsdatei ist momentan für jeden lesbar. Bitte ändern Sie die "
-"Zugriffsrechte!"
+msgstr "Ihre Konfigurationsdatei ist momentan für jeden lesbar. Bitte ändern Sie die Zugriffsrechte!"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -862,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Vor"
 
@@ -913,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr "Die angegebene Passwort-Differenz ist nicht numerisch."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr "Passwort-Methode"
 
@@ -921,52 +859,45 @@ msgstr "Passwort-Methode"
 msgid "Error: Password method not available!"
 msgstr "Fehler: Passwort-Methode ist nicht verfügbar!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-"Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
-"zugegriffen werden!"
+msgstr "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht zugegriffen werden!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"Die Passwörter, die Sie als 'Neues Passwort' und 'Neues Passwort "
-"(Wiederholung)' eingegeben haben sind nicht identisch."
+msgstr "Die Passwörter, die Sie als 'Neues Passwort' und 'Neues Passwort (Wiederholung)' eingegeben haben sind nicht identisch."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -974,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1045,145 +976,133 @@ msgstr "Smarty"
 #: html/main.php:136
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr ""
-"Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu "
-"beseitigen"
+msgstr "Konnte Datei '%s' nicht finden - bitte führen Sie '%s' aus um das Problem zu beseitigen"
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "PHP-Konfiguration"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Passwort-Änderung"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr "Ihr Passwort ist fast abgelaufen, bitte setzen Sie ein neues!"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "Der verfügbare Arbeitsspeicher wird knapp!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Prüfung der Benutzer-ACLs deaktiviert"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Erweiterung"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Konfigurationsfehler"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"FATAL: es wurden nicht alle POST-Variablen von PHP übertragen - bitte "
-"informieren Sie den Administrator!"
+msgstr "FATAL: es wurden nicht alle POST-Variablen von PHP übertragen - bitte informieren Sie den Administrator!"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "Die Sitzung ist nicht verschlüsselt!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer "
-"fusiondirectory.conf wird von der Einstellung in der php.ini überschrieben."
+msgstr "Die Konfiguration der Gültigkeitsdauer einer Sitzung in Ihrer fusiondirectory.conf wird von der Einstellung in der php.ini überschrieben."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Smarty-Fehler"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "Es gab ein Problem mit der Authentisierungseinrichtung!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"Es konnte kein gültiger Benutzer für die aktuell eingerichtete "
-"Authentisierung gefunden werden!"
+msgstr "Es konnte kein gültiger Benutzer für die aktuell eingerichtete Authentisierung gefunden werden!"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr "Kann Information über das installierte LDAP-Schema nicht ermitteln!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Ihre LDAP-Einrichtung enthält veraltete Schema-Definitionen:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Bitte geben Sie einen gültigen Benutzernamen ein!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Bitte geben Sie Ihr Passwort ein!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Authentifizierungsfehler"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr ""
-"Konnte Benutzerinformation für htaccess-Authentisierung nicht beziehen!"
+msgstr "Konnte Benutzerinformation für htaccess-Authentisierung nicht beziehen!"
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Bitte überprüfen Sie die Kombination von Benutzernamen und Passwort."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies "
-"und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
+msgstr "Ihr Browser hat Cookies deaktiviert. Bitte aktivieren Sie zunächst Cookies und laden anschliessend diese Seite neu, bevor Sie sich anmelden!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Information"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1194,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Stärke"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1223,35 +1141,32 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Zeige/Verstecke Informationen"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
-msgstr "Kennung"
+msgstr "Login"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1263,13 +1178,12 @@ msgid "Password"
 msgstr "Passwort"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Passwortfehler"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "System"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -1277,21 +1191,28 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Anschluss"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Erweiterung"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Persönliche Informationen"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1299,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Willkommen %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Allgemein"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Mail"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1349,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Abteilung"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Anwendung"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Server"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Thin Client"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Objektgruppe"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1442,469 +1360,461 @@ msgstr "Konfiguration"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Sprache"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Aussehen"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Passwort-Einstellungen"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Minimale Passwortlänge"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Verwende ablaufende Konten"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "Primären Gruppenfilter aktivieren"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Zeige Zusammenfassung in Listen"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Beachte administrative Einheiten"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Ermögliche Kopieren & Einfügen"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "Anmeldung und Sitzung"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Anmeldeattribut"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Erzwinge verschlüsselte Verbindungen"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Bei unverschlüsselten Verbindungen warnen"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Merken der Dialogfilter-Einstellungen"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Lebensdauer der Sitzung"
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Snapshots / Wiederherstellung"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Snapshots ermöglichen"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Basis für Snapshots"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Hooks"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr "Ablage für Personen und Gruppen"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "DN-Attribut für Personen"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Persönlichen Titel in der Benutzer-DN mitführen"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "Automatische UIDs"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Maximale LDAP Abfragedauer"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Protokolliere LDAP-Statistiken"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Debug Level"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1922,8 +1832,7 @@ msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
 #: plugins/personal/password/class_password.inc:115
 msgid "The password you've entered as 'New password' is empty."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
+msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
 
 #: plugins/personal/password/class_password.inc:117
 msgid "The password used as new and current are too similar."
@@ -1931,270 +1840,53 @@ msgstr "Das alte und neue Passwort sind sich zu ähnlich."
 
 #: plugins/personal/password/class_password.inc:119
 msgid "The password used as new is to short."
-msgstr ""
-"Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
+msgstr "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr "Check-Hook meldet ein Problem: %s. Passwortänderung wurde abgebrochen!"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
-msgstr ""
-"Das Passwort, welches Sie als aktuelles Passwort eingegeben haben, ist nicht "
-"korrekt."
+msgstr "Das Passwort, welches Sie als aktuelles Passwort eingegeben haben, ist nicht korrekt."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "Sie haben keine Berechtigung Ihr Passwort zu ändern."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Benutzer-Passwort ändern"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Generische Benutzer-Information"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
-"Bitte eine einzelne IP-Adresse oder eine Netzwerk/Netzmasken Kombination "
-"hinzufügen!"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "weiblich"
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "männlich"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Kann Datei nicht hochladen!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr "Die RDN kann nicht erstellt werden: + ist in sub RDNs nicht erlaubt!"
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "Kann RDN nicht erstellen: Attribut ist nicht definiert!"
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr "Kann RDN nicht erstellen: ungültige Attribut-Parameter!"
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
-msgstr "Die gewählte Passwort-Methode benötigt eine initiale Konfiguration!"
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Name"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Vorname"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Homepage"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Mobiltelefon"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Pager"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Geburtsdatum"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Referat"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Hausbezeichnung"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Anrede"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "letzte Übermittlung"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Dienstort"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Aufgabengebiet"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Sachgebiet"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Amts-/Dienstbezeichnung"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Öffentlich sichtbar"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Straße"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Rolle"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Postleitzahl"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2205,122 +1897,76 @@ msgstr "Allgemeine Benutzereinstellungen"
 msgid "User"
 msgstr "Benutzer"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Persönliche Informationen"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "Nachname"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Benutzerkennung"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Vorname"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Geburtsdatum"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Bevorzugte Sprache"
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Basis"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Benutzerbild"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Anmeldungs-Einschränkungen"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organisation"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Abteilungsnummer"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2332,66 +1978,52 @@ msgstr "Abteilungsnummer"
 msgid "Description"
 msgstr "Beschreibung"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
-msgstr "Verwalter"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Personalnummer"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Anstellungsart"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Raumnummer"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Telefonnummer"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Pagernummer"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Mobiltelefon"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Faxnummer"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Land"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2399,306 +2031,439 @@ msgstr "Land"
 msgid "Location"
 msgstr "Ort"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Land"
+
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
 msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:1411
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Zimmer-Nr."
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Raumnummer"
+
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Mobiltelefon"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Pager"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Angabe zur Organisationseinheit"
+
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organisation"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Abteilungs-Nr."
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Abteilungsnummer"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Angestellten-Nr."
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Personalnummer"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Anstellungsart"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr "Verwalter"
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Privat-Telefon"
+
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Benutzer Passwort-Methode"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Einträge unterscheiden sich"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
 msgstr "Bitte wählen Sie die gewünschten Einträge"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Windows-Arbeitsstation"
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "POSIX-Eigenschaften bearbeiten"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Mail-Einstellungen bearbeiten"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Samba-Einstellungen bearbeiten"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Telefon-Einstellungen bearbeiten"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "Menü"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Startmenü-Einstellungen bearbeiten"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Umgebung"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Umgebungs-Einstellungen bearbeiten"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Name"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Primäre Gruppe"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Status"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Erzwinge UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Gruppenmitgliedschaft"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "Der Benutzer muss beim ersten Anmelden sein Passwort ändern"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "System-Vertrauen"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Vertrauens-Modus"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Benutzer POSIX-Einstellungen bearbeiten"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "abgelaufen"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "Nachfrist aktiv"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "aktiv"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "Passwort abgelaufen"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "Passwort kann nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Wartezeit für Sperre abgelaufen. Ignoriere Sperre!"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Gruppe des Benutzers"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2817,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2830,122 +2595,107 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Organisationsname"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Kategorie"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Telefonnummer"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Basis"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Administrative Einstellungen"
+msgid "Postal address"
+msgstr "Adresse"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Telefonnummer"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "Domänen-Komponente"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "Kann keinen unbenutzten Tag für diese administrative Einheit finden!"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Markiere '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Fortsetzen"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verschiebe '%s' nach '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Objekt"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Fehler beim kopieren von %s, breche ab"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Abteilungen"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Name der Abteilung"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Adresse"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Telefon"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Objekt '%s' ist bereits markiert"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Entferne Markierung von Objekt '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
-msgstr "Domain"
+msgstr "Domäne"
 
 #: plugins/admin/departments/dep-list.xml:11
 msgid "List of departments"
@@ -2960,8 +2710,8 @@ msgstr "Domänen-Komponente"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Land"
 
@@ -2969,8 +2719,8 @@ msgstr "Land"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Standort"
 
@@ -2978,24 +2728,26 @@ msgstr "Standort"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Aktionen"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Name des Landes"
@@ -3013,11 +2765,24 @@ msgid "List of users"
 msgstr "Liste der Benutzer"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Vorlage"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Nachname"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Vorname"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3029,7 +2794,7 @@ msgstr "Vorlage"
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Passwort ändern"
@@ -3050,15 +2815,15 @@ msgstr "Vorlage anwenden"
 msgid "New user from template"
 msgstr "Neuen Benutzer aus Vorlage"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "Benutzer entfernen"
 
@@ -3066,16 +2831,16 @@ msgstr "Benutzer entfernen"
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr "Berechtigung"
 
@@ -3083,41 +2848,39 @@ msgstr "Berechtigung"
 msgid "You have no permission to change this users password!"
 msgstr "Sie haben keine Berechtigung dieses Passwort zu ändern!"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Konto-Sperrung"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto %s wurde "
-"nicht gesperrt!"
+msgstr "Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto %s wurde nicht gesperrt!"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Konto aktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Konto deaktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3125,58 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"Die UID '%s' konnte nicht zur Gruppe '%s' hinzugefügt werden: Benutzer-"
-"Objekt nicht gefunden!"
+msgstr "Die UID '%s' konnte nicht zur Gruppe '%s' hinzugefügt werden: Benutzer-Objekt nicht gefunden!"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
-msgstr ""
-"Die UID '%s' konnte nicht zur Gruppe '%s' hinzugefügt werden: UID ist "
-"bereits vorhanden!"
+msgstr "Die UID '%s' konnte nicht zur Gruppe '%s' hinzugefügt werden: UID ist bereits vorhanden!"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "! unbekannte UID"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"Die Suche ergab zu viele Treffer. Es werden nicht mehr als %s Einträge "
-"angezeigt!"
+msgstr "Die Suche ergab zu viele Treffer. Es werden nicht mehr als %s Einträge angezeigt!"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kann keine SID für '%s' finden!"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kann keine RIDBASE für '%s' finden!"
@@ -3190,23 +2947,23 @@ msgstr "Die Gruppen ID-Nummer '%s' wird bereits von %s verwendet!"
 msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Samba Domänen-Name"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Gesprächs-Annahme Gruppe"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Nagios-Gruppe"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Gruppenmitglieder"
 
@@ -3234,119 +2991,159 @@ msgstr "Gruppe löschen"
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "POSIX-Eigenschaften bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Mail-Einstellungen bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Samba-Einstellungen bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Telefon-Einstellungen bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "Menü"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Startmenü-Einstellungen bearbeiten"
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Umgebung"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Umgebungs-Einstellungen bearbeiten"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Benutzer wählen"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Rollen für die Zugriffskontrolle"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "ACL-Rollen bearbeiten"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Alle Kategorien"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "ACL zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Diese Ebene"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Aktuelles Objekt"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Vollständiger Teilbaum"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Vollständiger Teilbaum (permanent)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Auf"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Ab"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Entfernen"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "Keine ACL-Einstellungen für diese Kategorie"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "Enthält ACL für diese Objekte: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "ACL Kategorie bearbeiten"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "ACL-Kategorie zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Alle Objekte im aktuellen Teilbaum"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Objekt in Verwendung"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Die Rolle kann nicht entfernt werden, solange sie noch von folgenden "
-"Objekten verwendet wird:"
+msgstr "Die Rolle kann nicht entfernt werden, solange sie noch von folgenden Objekten verwendet wird:"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Rolle"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Rollen für die Zugriffskontrolle"
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "Berechtigungen"
 
@@ -3354,7 +3151,7 @@ msgstr "Berechtigungen"
 msgid "List of acls"
 msgstr "Liste der ACLs"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "ACL"
@@ -3372,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "ACL Vorlagen"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Objektgruppen"
 
@@ -3392,59 +3189,68 @@ msgstr "Vorlagen"
 msgid "Windows Install"
 msgstr "Windows Installation"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Warteschlange"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Anwendungen"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Windows-Arbeitsstation"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Geräte"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Start"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "FAI-Übersicht"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Warteschlange"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Anwendungen"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Die folgenden Systeme sind bereits für die Konfiguration über eine "
-"Objektgruppe vorgeseheb und können nicht hinzugefügt werden:"
+msgstr "Die folgenden Systeme sind bereits für die Konfiguration über eine Objektgruppe vorgeseheb und können nicht hinzugefügt werden:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3454,9 +3260,7 @@ msgstr "Information"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"Sie können Terminals und Arbeitsstationen nicht zu einer Objektgruppe "
-"zusammenfassen!"
+msgstr "Sie können Terminals und Arbeitsstationen nicht zu einer Objektgruppe zusammenfassen!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3464,14 +3268,13 @@ msgstr "Unbekannte dn:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:761
 msgid "You can combine two different object types at maximum, only!"
-msgstr ""
-"Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
+msgstr "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:896
 msgid "Object group generic"
 msgstr "Objektgruppe (Allgemein)"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Mitglied"
 
@@ -3500,40 +3303,34 @@ msgstr "Objektgruppe löschen"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"Es wurde keine Plugin-Definition gefunden um '%s' zu Initialisieren. Bitte "
-"prüfen Sie Ihre Konfigurationsdatei!"
+msgstr "Es wurde keine Plugin-Definition gefunden um '%s' zu Initialisieren. Bitte prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Referenzen"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "Sortierbare Liste"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "in"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "in Zeile"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "XML-Fehler"
 
@@ -3577,48 +3374,44 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
-"Seite!"
+msgstr "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser Seite!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Fehlerbericht senden"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Interner Fehler"
 
 #: include/class_session.inc:100 include/class_session.inc:137
 #: include/class_session.inc:175
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
-"Administrator."
+msgstr "Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren Administrator."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Zeige Rollen"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, 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."
@@ -3626,103 +3419,135 @@ msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, 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."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Gruppe des Benutzers"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "Keine"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "'%s' muß kleiner sein als %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "'%s' muß kleiner sein als %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Kann Datei nicht hochladen!"
+msgstr "Kann hochgeladene Datei nicht lesen: %s"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Zertifikat ist leer!"
+msgstr "Die Datei ist leer"
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "Die Datei wurde nicht gefunden"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "Die Datei ist nicht lesbar"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Neu laden"
+msgstr "Hochladen"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Ab"
+msgstr "Herunterladen"
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Objektname"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3744,7 +3569,7 @@ msgstr "Auswählen um Objekte des Typs '%s' aufzulisten"
 msgid "Select to search within subtrees"
 msgstr "Wählen Sie diese Option um auch in Teilbäumen zu suchen"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Suche in Teilbäumen"
@@ -3855,12 +3680,12 @@ msgstr "Verbindungs-Information"
 #: include/class_msgPool.inc:220
 #, php-format
 msgid "Cannot connect to %s database!"
-msgstr "Kann keine Verbindung zur %s Datenbank aufbauen!"
+msgstr "Konnte nicht zur %s Datenbank verbinden!"
 
 #: include/class_msgPool.inc:240
 #, php-format
 msgid "Cannot select %s database!"
-msgstr "Kann die Datenbank %s nicht auswählen!"
+msgstr "Konnte keine Auswahl auf %s Datenbank durchführen!"
 
 #: include/class_msgPool.inc:250
 #, php-format
@@ -3870,7 +3695,7 @@ msgstr "Kein Server für %s definiert!"
 #: include/class_msgPool.inc:270
 #, php-format
 msgid "Cannot query %s database!"
-msgstr "Kann die Datenbank %s nicht abfragen!"
+msgstr "Konnte %s Datenbank nicht abfragen!"
 
 #: include/class_msgPool.inc:280
 #, php-format
@@ -3880,114 +3705,113 @@ msgstr "Das Feld '%s' enthält ein reserviertes Schlüsselwort!"
 #: include/class_msgPool.inc:292
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr ""
-"Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
+msgstr "Das als '%s'-Erweiterung angegebene Kommando für Modul '%s' existiert nicht!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "'%s'-Kommando ist ungültig!"
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "'%s' Kommando (%s) für Modul %s ist ungültig!"
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "'%s' Kommando für Modul %s ist ungültig!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "'%s' Kommando (%s) ist ungültig!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "Kann '%s' Kommando nicht ausführen!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "'%s' Kommando (%s) für Modul %s ist ungültig!"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Kann '%s' Kommando (%s) für Modul %s nicht ausführen!"
+msgid "Cannot execute '%s' command!"
+msgstr "Kann '%s' Kommando nicht ausführen!"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Kann '%s' Kommando für Modul %s nicht ausführen!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Kann '%s' Kommando (%s) nicht ausführen!"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Kann '%s' Kommando (%s) für Modul %s nicht ausführen!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Der Wert für '%s' ist zu groß!"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' muß kleiner sein als %s!"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Der Wert für '%s' ist zu kein!"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' muß größer oder gleich %d sein!"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' hängt von '%s' ab - bitte geben Sie beide Werte an!"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Es existiert bereits ein Eintrag mit diesem '%s' Attribut im System!"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Das Pflicht-Feld '%s' ist leer!"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Beispiel"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Das Feld '%s' enthält ungültige Zeichen"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' ist nicht erlaubt:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' sind nicht erlaubt!"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Das Feld '%s' enthält ungültige Zeichen!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
-msgstr "Fehlenden %s PHP-Erweiterung!"
+msgstr "Fehlende %s PHP-Erweiterung"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4000,11 +3824,10 @@ msgstr "Fehlenden %s PHP-Erweiterung!"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4012,316 +3835,303 @@ msgstr "Abbrechen"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Anwenden"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Speichern"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "%s hinzufügen"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Setzen"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "%s einstellen"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "%s bearbeiten..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Zurück"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Dieses Konto besitzt keine gültigen %s-Einstellungen."
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch "
-"einen Klick auf die untere Schaltfläche deaktivieren."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Dieses Konto besitzt aktivierte %s-Einstellungen. Sie können diese durch einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, "
-"müssen Sie zunächst die %s Einstellungen entfernen!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Dieses Konto besitzt aktivierte %s-Erweiterungen. Um sie zu deaktivieren, müssen Sie zunächst die %s Einstellungen entfernen!"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch "
-"einen Klick auf die Schaltfläche aktivieren."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Dieses Konto hat keine %s-Einstellungen aktiviert. Sie können Sie durch einen Klick auf die Schaltfläche aktivieren."
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu "
-"aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
+msgstr "Dieses Konto besitzt aktuell keine aktivierten %s-Einstellungen. Um sie zu aktivieren, müssen Sie zunächst die %s Erweiterungen hinzufügen!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "%s Einstellungen hinzufügen"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "%s Einstellungen entfernen"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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"
+msgstr "Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem Dialog zu ändern"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Januar"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Februar"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "März"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "August"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Dezember"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Montag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Freitag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Samstag"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "Lese-Operation"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "Hinzufügeoperation"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "Änderungs-Operation"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "Lösch-Operation"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "Such-Operation"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "Authentifizierung"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s fehlgeschlagen!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "LDAP-Operation fehlgeschlagen"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "Übertragung fehlgeschlagen!"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Übertragung fehlgeschlagen: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Kommunikationsfehler mit dem Infrastruktur Dienst: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieses Objekts: %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Dieses '%s' ist noch in Benutzung."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Dieses '%s' ist noch in Gebrauch dieser Objekte: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Die Datei '%s' existiert nicht!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kann Datei '%s' nicht zum Lesen öffnen!"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kann Datei '%s' nicht zum Schreiben öffnen!"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte "
-"prüfen Sie Ihre Konfigurationsdatei!"
+msgstr "Der Wert für '%s' ist momentan nicht konfiguriert oder ungültig. Bitte prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kann Datei '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht anlegen!"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kann den Ordner '%s' nicht löschen!"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Prüfe auf %s-Unterstützung"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installieren und aktivieren Sie das %s PHP-Modul."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
-msgstr ""
-"Die angegebene Basis ist ungültig. Der alte Wert wurde wieder hergestellt!"
+msgstr "Die angegebene Basis ist ungültig. Der alte Wert wurde wieder hergestellt!"
 
 #: include/exporter/class_cvsExporter.inc:92
 msgid "CSV"
@@ -4339,111 +4149,105 @@ msgstr "Kein PDF-Export möglich: FPDF-Bibliothek ist nicht installiert."
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "Filter Fehler"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "Der Filter ist unvollständig!"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"Es wurde keine TAB-Definition für '%s' in der Konfigurationsdatei gefunden. "
-"Kann keine Plugin-Instanz erzeugen!"
+msgstr "Es wurde keine TAB-Definition für '%s' in der Konfigurationsdatei gefunden. Kann keine Plugin-Instanz erzeugen!"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Zertifikat ist leer!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr "Zertifikat kann nicht geladen werden - nur PEM/DER sind unterstützt!"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
-msgstr ""
-"Zertifikatinformationen können nur für PEM Zertifikate ermittelt werden!"
+msgstr "Zertifikatinformationen können nur für PEM Zertifikate ermittelt werden!"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Kein gültiges Zertifikat geladen!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Alle abbrechen"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei fusiondirectory.conf: %s in Zeile %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
-"Administrator."
+msgstr "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den Administrator."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID und/oder sambaRidBase fehlen in der Konfiguration!"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable "
-"'%s' ist nicht gesetzt."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable '%s' ist nicht gesetzt."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"Die Snapshot-Funktionalität ist aktiviert, aber das erforderliche Modul ist "
-"nicht verfügbar. Bitte installieren Sie '%s'."
+msgstr "Die Snapshot-Funktionalität ist aktiviert, aber das erforderliche Modul ist nicht verfügbar. Bitte installieren Sie '%s'."
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Alle Kategorien"
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Mein Konto"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Übertragen"
 
@@ -4456,201 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"Es konnte keine passende Passwort-Methode für den aktuellen Hash gefunden "
-"werden!"
+msgstr "Es konnte keine passende Passwort-Methode für den aktuellen Hash gefunden werden!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "Ändere ACL dn"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "von"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "ACLs zurücksetzen"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Verwende ACL aus Rollendefinition"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Keine ACL-Einstellungen für diese Kategorie!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Enthält ACLs für diese Objekte: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "ACL Kategorie"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "ACL für '%s' bearbeiten - Gültigkeitsbereich ist '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Zeige/verstecke erweiterte Einstellungen"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Erstelle Objekte"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Objekte verschieben"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Objekte entfernen"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Berechtigungen für Eigentümer einräumen"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "lesen"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "schreiben"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "Vollständiges Objekt"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Unbekannter ACL-Typ '%s'!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Unbekannter Eintrag '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Rolle: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "unbekannte rolle"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Enthält Einstellungen für diese Objekte: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Mitglieder"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "inaktiv"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "Keine Mitglieder"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Zugriffskontrolllisten verwalten"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "ACL-Rollen"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "Angelegt von"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
@@ -4673,327 +4475,288 @@ msgstr "Der angegebene Objekt-Typ ist leer oder ungültig!"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"Die Einstellung '%s' der Zeitzone in Ihrer fusiondirectory.conf ist "
-"ungültig. Kann Zeitzonen-Versatz nicht berechnen."
+msgstr "Die Einstellung '%s' der Zeitzone in Ihrer fusiondirectory.conf ist ungültig. Kann Zeitzonen-Versatz nicht berechnen."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Leistungswarnung"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
-msgstr ""
-"Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f "
-"Sekunden!"
+msgstr "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f Sekunden!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: keine Objektklasse "
-"gefunden!"
+msgstr "Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: keine Objektklasse gefunden!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr ""
-"Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: nicht unterstützt"
+msgstr "Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: nicht unterstützt"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "Fehlendes Kommandozeilenprogramm '%s'!"
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
-"'dn:...' beginnen in Zeile %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit 'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
-"Zeile %s!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab Zeile %s!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Keine Objekte dieser Kategorie"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
-msgstr ""
-"Das Konfigurationsformat hat sich geändert. Bitte durchlaufen Sie erneut die "
-"Einrichtung!"
+msgstr "Das Konfigurationsformat hat sich geändert. Bitte durchlaufen Sie erneut die Einrichtung!"
 
 #: include/class_databaseManagement.inc:80
 msgid "Please activate debugging for details!"
 msgstr "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Sie sind dabei den Snapshot '%s' zu entfernen."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Snapshot entfernen."
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Schwerer Fehler: keine Klassenfundorte definiert - bitte führen Sie '%s' "
-"aus, um das Problem zu beheben"
+msgstr "Schwerer Fehler: keine Klassenfundorte definiert - bitte führen Sie '%s' aus, um das Problem zu beheben"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie "
-"'%s' aus um das Problem zu beheben"
+msgstr "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie '%s' aus um das Problem zu beheben"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
+msgstr "FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum."
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum. Bitte "
-"kontaktieren Sie Ihren Administrator."
+msgstr "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum. Bitte kontaktieren Sie Ihren Administrator."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
-msgstr ""
-"Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
+msgstr "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
-"Ihren Administrator!"
+msgstr "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie Ihren Administrator!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
-"passieren - räume mehrere Referenzen auf."
+msgstr "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
-"Meldung bei Überschreitung wieder an"
+msgstr "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' ist nicht verfügbar. Verwende die Standard-Basis!"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung "
-"möglich!"
+msgstr "Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung möglich!"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Verwendet, um kontenbezogene Informationen zu speichern."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um "
-"gleichzeitige Änderungen zu verhindern)."
+msgstr "Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um gleichzeitige Änderungen zu verhindern)."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Die benötigte Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Die optionale Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Falsche·Version·der·benötigten·Objektklasse·'%s'·(!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Sie haben die rfc2307bis-Option in der LDAP-Einrichtung aktiviert, aber Ihre "
-"Schema-Konfiguration unterstützt dies nicht."
+msgstr "Sie haben die rfc2307bis-Option in der LDAP-Einrichtung aktiviert, aber Ihre Schema-Konfiguration unterstützt dies nicht."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Um rfc2307bis-konforme Gruppen verwenden zu können, muss die Objektklasse "
-"'posixGroup' AUXILIARY sein"
+msgstr "Um rfc2307bis-konforme Gruppen verwenden zu können, muss die Objektklasse 'posixGroup' AUXILIARY sein"
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Ihre Schemakonfiguration ist für rfc2307bis-Gruppen eingerichtet, aber Sie "
-"haben die Unterstützung im LDAP-Einrichtungsschritt ausgeschaltet."
+msgstr "Ihre Schemakonfiguration ist für rfc2307bis-Gruppen eingerichtet, aber Sie haben die Unterstützung im LDAP-Einrichtungsschritt ausgeschaltet."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "Die Objektklasse 'posixGroup' muss STRUCTURAL sein"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
+msgstr "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu existieren."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Konnte keine freie ID allozieren:"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "unbekannte idAllocation-Methode!"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "kann sambaUnixIdPool-Eintrag nicht anlegen!"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool ist nicht eindeutig!"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "keine ID verfügbar!"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "maximale Anzahl von Versuchen abgelaufen!"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "Konnte keine freie ID allozieren!"
 
@@ -5020,9 +4783,7 @@ msgstr "Anmeldefenster"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Nutzen Sie Ihren Benutzernamen und Ihr Passwort, um sich an der Verwaltung "
-"des Standorts anzumelden."
+msgstr "Nutzen Sie Ihren Benutzernamen und Ihr Passwort, um sich an der Verwaltung des Standorts anzumelden."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5055,7 +4816,6 @@ msgstr "Hier klicken zum Anmelden"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5065,6 +4825,7 @@ msgstr "Hier klicken zum Anmelden"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
 
@@ -5076,23 +4837,15 @@ msgstr "Ein Sitzungskonflikt wurde festgestellt"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Vermutlich existiert eine andere aktive Instanz Ihrer Sitzung. Das Arbeiten "
-"mit mehreren Fenstern ist technisch so nicht möglich und hängt stark vom "
-"eingesetzten Browser ab. Die Verwendung unterschiedlicher Browser zur "
-"gleichen Zeit (z.B. IE und Mozilla) ist möglich. Das Drücken von 'Abmelden' "
-"schließt diese Sitzung."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Vermutlich existiert eine andere aktive Instanz Ihrer Sitzung. Das Arbeiten mit mehreren Fenstern ist technisch so nicht möglich und hängt stark vom eingesetzten Browser ab. Die Verwendung unterschiedlicher Browser zur gleichen Zeit (z.B. IE und Mozilla) ist möglich. Das Drücken von 'Abmelden' schließt diese Sitzung."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Falls Sie trotzdem fortfahren, können einige Daten der momentan bearbeiteten "
-"Dialoge verlorengehen. Deshalb schließen Sie bitte die verschiedenen Fenster "
-"und melden sich neu an."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Falls Sie trotzdem fortfahren, können einige Daten der momentan bearbeiteten Dialoge verlorengehen. Deshalb schließen Sie bitte die verschiedenen Fenster und melden sich neu an."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5124,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -5144,9 +4897,9 @@ msgstr "Neues Passwort (Wiederholung)"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr "Passwort-Stärke"
 
@@ -5212,9 +4965,7 @@ msgstr ""
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"Vergessen Sie nicht, Verweise auf andere Objekte zu überprüfen, bspw. ob der "
-"gewählte Drucker noch existiert."
+msgstr "Vergessen Sie nicht, Verweise auf andere Objekte zu überprüfen, bspw. ob der gewählte Drucker noch existiert."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5222,9 +4973,7 @@ msgstr "Es ist kein Snapshot verfügbar, der wiederhergestellt werden kann"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Wählen Sie einen Snapshot und klicken Sie auf das Ordner-Bild, um diesen "
-"wiederherzustellen."
+msgstr "Wählen Sie einen Snapshot und klicken Sie auf das Ordner-Bild, um diesen wiederherzustellen."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5235,19 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Dieser Vorgang wird einen Snapshot des gewählten Objekts erzeugen. Er wird "
-"innerhalb eines speziellen Zweiges Ihres Verzeichnisses gespeichert und kann "
-"später wieder hergestellt werden."
+msgstr "Dieser Vorgang wird einen Snapshot des gewählten Objekts erzeugen. Er wird innerhalb eines speziellen Zweiges Ihres Verzeichnisses gespeichert und kann später wieder hergestellt werden."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Beachten Sie, dass Datenbankeinträge, DNS-Konfigurationen und evtl. "
-"erstellte Zonen in den Server-Erweiterungen nicht im Snapshot gespeichert "
-"werden."
+msgstr "Beachten Sie, dass Datenbankeinträge, DNS-Konfigurationen und evtl. erstellte Zonen in den Server-Erweiterungen nicht im Snapshot gespeichert werden."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5269,9 +5012,7 @@ msgstr ""
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+msgstr "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder 'Abbrechen' zum Abbruch."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5282,28 +5023,19 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Wenn diese Anzeige eines Zugriffskonflikts fehlerhaft ist, hat eine andere "
-"Person offenbar während der Bearbeitung eines Eintrages einfach den "
-"Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch "
-"einen Klick auf Trotzdem bearbeiten übergehen."
+msgstr "Wenn diese Anzeige eines Zugriffskonflikts fehlerhaft ist, hat eine andere Person offenbar während der Bearbeitung eines Eintrages einfach den Webbrowser geschlossen. In einem solchen Fall können Sie den Konflikt durch einen Klick auf Trotzdem bearbeiten übergehen."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
-msgstr "Nur anschauen"
+msgstr "Nur Lesen"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller "
-"durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der "
-"einfachste Weg, große Datenbanken ohne große Zeitüberschreitungen zu "
-"bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen "
-"sinnvollen Wert einzustellen."
+msgstr "Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der einfachste Weg, große Datenbanken ohne große Zeitüberschreitungen zu bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen sinnvollen Wert einzustellen."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5311,16 +5043,13 @@ msgstr "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
 
 #: ihtml/themes/default/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
+msgstr "Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
 
 #: ihtml/themes/default/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der "
-"Größenbeschränkung liegen"
+msgstr "Ignoriere diesen Fehler und zeige alle Einträge, die innerhalb der Größenbeschränkung liegen"
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5388,10 +5117,6 @@ msgstr "Angemeldet:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5406,10 +5131,7 @@ msgstr ""
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Bitte schliessen Sie dieses Browserfenster und leeren den "
-"Authentisierungscache um eine automatische Wiederanmeldung des Browsers zu "
-"verhindern."
+msgstr "Bitte schliessen Sie dieses Browserfenster und leeren den Authentisierungscache um eine automatische Wiederanmeldung des Browsers zu verhindern."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5417,20 +5139,17 @@ msgstr "Ihr Passwort ändern"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Dieser Dialog ermöglicht Ihnen auf einfache Weise, Ihr Passwort zu ändern. "
-"Geben Sie das aktuelle Passwort und zweimal das neue Passwort in den Feldern "
-"unterhalb ein und drücken Sie den 'Ändern'-Knopf."
+msgstr "Dieser Dialog ermöglicht Ihnen auf einfache Weise, Ihr Passwort zu ändern. Geben Sie das aktuelle Passwort und zweimal das neue Passwort in den Feldern unterhalb ein und drücken Sie den 'Ändern'-Knopf."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Momentanes Passwort"
 
@@ -5447,9 +5166,7 @@ msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Beachten Sie, dass manche Einstellungen wie z.B. erstellte Snapshots nicht "
-"kopiert werden!"
+msgstr "Beachten Sie, dass manche Einstellungen wie z.B. erstellte Snapshots nicht kopiert werden!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
@@ -5502,7 +5219,7 @@ msgstr "TLS-Verbindung"
 #: setup/setup_ldap.tpl.c:29 setup/setup_ldap.tpl.c:32
 #: setup/setup_migrate.tpl.c:95
 msgid "Reload"
-msgstr "Neu laden"
+msgstr "Aktualisieren"
 
 #: setup/setup_ldap.tpl.c:35
 msgid "Authentication"
@@ -5599,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5638,9 +5355,7 @@ msgstr "Verschiebe Gruppen in den konfigurierten Gruppenbaum"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Dieser Dialog ermöglicht Ihnen das Verschieben einer Zahl von Gruppen in den "
-"konfigurierten Gruppenbaum. Dies kann Ihren LDAP-Dienst aufräumen."
+msgstr "Dieser Dialog ermöglicht Ihnen das Verschieben einer Zahl von Gruppen in den konfigurierten Gruppenbaum. Dies kann Ihren LDAP-Dienst aufräumen."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
@@ -5675,9 +5390,7 @@ msgstr "Verschiebe Benutzer in den konfigurierten Benutzerbaum"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Dieser Dialol ermöglicht Ihnen das Verschieben einer Zahl von Nutzern in den "
-"konfigurierten Benutzerbaum. Dies kann Ihren LDAP-Dienst aufräumen."
+msgstr "Dieser Dialol ermöglicht Ihnen das Verschieben einer Zahl von Nutzern in den konfigurierten Benutzerbaum. Dies kann Ihren LDAP-Dienst aufräumen."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
@@ -5712,9 +5425,7 @@ msgstr ""
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"Dieser Dialog wird automatisch einen neuen Superadministrator in Ihren LDAP-"
-"Baum einfügen."
+msgstr "Dieser Dialog wird automatisch einen neuen Superadministrator in Ihren LDAP-Baum einfügen."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
@@ -5737,10 +5448,7 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Wenn Sie erfahren möchten, was bei der Migration der gewählten Einträge "
-"erfolgen wird, verwenden Sie den 'Zeige Änderungen'-Knopf um das LDIF zu "
-"sehen."
+msgstr "Wenn Sie erfahren möchten, was bei der Migration der gewählten Einträge erfolgen wird, verwenden Sie den 'Zeige Änderungen'-Knopf um das LDIF zu sehen."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
@@ -5751,17 +5459,17 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
-msgstr "Auffrischen"
+msgstr "Aktualisieren"
 
 #: setup/setup_migrate.tpl.c:218
 msgid ""
@@ -5773,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5795,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5856,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5870,13 +5579,9 @@ msgstr "Bitte wählen Sie Ihre bevorzugte Sprache"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"An dieser Stelle können Sie die standortweite Standardsprache auswählen. Bei "
-"Auswahl von 'automatisch' wird automatisch die vom Browser angeforderte "
-"Sprache verwendet. Diese Einstellung kann von der Einstellung des Benutzers "
-"überschrieben werden."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "An dieser Stelle können Sie die standortweite Standardsprache auswählen. Bei Auswahl von 'automatisch' wird automatisch die vom Browser angeforderte Sprache verwendet. Diese Einstellung kann von der Einstellung des Benutzers überschrieben werden."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -5890,27 +5595,27 @@ msgstr "Bitte wählen Sie hier Ihre bevorzugte Zeitzone"
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Aktiviere Bearbeitungssperre"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Erzwinge das Deaktivieren von register_globals"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Zeige PHP Fehler"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -5947,9 +5652,7 @@ msgstr "Versucht, Probleme in Ihrer PHP- und LDAP-Umgebung zu ermitteln"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr ""
-"Lässt Sie aus einem Satz von einfachen bis erweiterten "
-"Konfigurationsschaltern wählen"
+msgstr "Lässt Sie aus einem Satz von einfachen bis erweiterten Konfigurationsschaltern wählen"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -6025,11 +5728,9 @@ msgstr "Schema-Prüfung fehlgeschlagen"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"Konnte keine Schema-Informationen beziehen, alle Prüfungen wurden "
-"übersprungen. Passen Sie Ihre LDAP-ACLs an."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "Konnte keine Schema-Informationen beziehen, alle Prüfungen wurden übersprungen. Passen Sie Ihre LDAP-ACLs an."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
@@ -6078,9 +5779,7 @@ msgstr "Dieses Objekt hat keine Referenzen zu anderen Objekten."
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle "
-"Programme anzupassen, die dieses Passwort auch benutzen."
+msgstr "Sie haben erfolgreich Ihr Passwort geändert. Bitte denken Sie daran alle Programme anzupassen, die dieses Passwort auch benutzen."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6093,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Um das Passwort zu ändern, benutzen Sie das untere Feld. Die Änderung wird "
-"sofort wirksam. Bitte merken Sie sich das neue Passwort, da Sie sich ohne "
-"dieses nicht mehr anmelden können."
+msgstr "Um das Passwort zu ändern, benutzen Sie das untere Feld. Die Änderung wird sofort wirksam. Bitte merken Sie sich das neue Passwort, da Sie sich ohne dieses nicht mehr anmelden können."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6104,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Das Ändern des Passwortes wirkt sich auf ihre Authentifizierung bei Mail-, "
-"Proxy-, Samba- und Unix-Diensten aus."
+msgstr "Das Ändern des Passwortes wirkt sich auf ihre Authentifizierung bei Mail-, Proxy-, Samba- und Unix-Diensten aus."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "Ihr Passwort ist abgelaufen. Geben Sie bitte ein neues ein!"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Neues Passwort (Wiederholung)"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Passwort-Änderungsdialog"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "Vorschlag verwenden"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "Passwort vorgeben"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Felder löschen"
 
@@ -6152,55 +5841,10 @@ msgstr "Felder löschen"
 msgid "Your password hash method will not be changed!"
 msgstr "Ihr Passwort-Hash wird nicht geändert!"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Zertifikate"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Standard-Zertifikat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "S/MIME-Zertifikat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "PKCS12-Zertifikat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Zertifikat-Seriennummer"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Bild"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Bild entfernen"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Benutzer-Einstellungen"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Nachname"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Vorname"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Passwort löschen"
@@ -6209,59 +5853,17 @@ msgstr "Passwort löschen"
 msgid "Set new password"
 msgstr "Neues Passwort setzen"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Persönliche Informationen"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Bild ändern"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Name der Vorlage"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Bevorzugte Sprache"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Privat-Telefon"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Passwort-Speicherung"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Anmeldung beschränken"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP oder Netzwerk"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Angabe zur Organisationseinheit"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Abteilungs-Nr."
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Angestellten-Nr."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Bild"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Zimmer-Nr."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Benutzerbild"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Verwenden sie den Telefon-Reiter"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Bild entfernen"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6278,23 +5880,6 @@ msgstr "Zeige Samba Gruppen"
 msgid "Show mail groups"
 msgstr "Zeige Mail Gruppen"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Zeige Server"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Zeige Terminals"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6313,15 +5898,6 @@ msgstr "Name des zu erzeugenden Standortes"
 msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Abteilung als eigenständige administrative Einheit kennzeichnen"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Gewünschte Operation wird durchgeführt"
@@ -6330,9 +5906,7 @@ msgstr "Gewünschte Operation wird durchgeführt"
 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."
+msgstr "Ihr Browser unterstützt keine IFrames - bitte wählen Sie diesen Link, um die gewünschte Operation durchzuführen."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6340,17 +5914,13 @@ msgstr "Name des anzulegenden Landes"
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:5
 msgid "You are currently moving/renaming this department."
-msgstr ""
-"Momentan sind Sie dabei, diese Abteilung zu verschieben bzw. neu zu benennen."
+msgstr "Momentan sind Sie dabei, diese Abteilung zu verschieben bzw. neu zu benennen."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:8
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"Verändern des für die Namensbildung zuständigen Attributes 'ou' einer "
-"Abteilung oder der Basis kann vorhandene ACLs und/oder Snapshots für alle "
-"Objekte unbrauchbar machen."
+msgstr "Verändern des für die Namensbildung zuständigen Attributes 'ou' einer Abteilung oder der Basis kann vorhandene ACLs und/oder Snapshots für alle Objekte unbrauchbar machen."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6360,10 +5930,7 @@ msgstr ""
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Bevor Sie diese Aktion bestätigen, stellen Sie sicher, dass alles wie "
-"erwartet sein wird, vielleicht ist die beste Lösung, vorher ein Backup zu "
-"erstellen."
+msgstr "Bevor Sie diese Aktion bestätigen, stellen Sie sicher, dass alles wie erwartet sein wird, vielleicht ist die beste Lösung, vorher ein Backup zu erstellen."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6415,10 +5982,7 @@ 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. Wenn Sie dies erledigt "
-"haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
-"Vorgang abzubrechen."
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6448,9 +6012,7 @@ msgstr "Vorlage anwenden"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Das Anwenden einer Vorlage ersetzt alle in der Vorlage definierten Attribute "
-"des Benutzers."
+msgstr "Das Anwenden einer Vorlage ersetzt alle in der Vorlage definierten Attribute des Benutzers."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6465,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Das Anlegen von neuen Benutzern kann durch die Verwendung von Vorlagen "
-"vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
-"ausfüllen. Wählen sie 'keine' um den Vorlagen-Dialog zu überspringen."
+msgstr "Das Anlegen von neuen Benutzern kann durch die Verwendung von Vorlagen vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch ausfüllen. Wählen sie 'keine' um den Vorlagen-Dialog zu überspringen."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6492,9 +6051,9 @@ msgstr "Zeige Samba Benutzer"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6502,20 +6061,13 @@ msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die "
-"Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
-"Benutzer ohne dieses Passwort nicht anmelden kann."
+msgstr "Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der Benutzer ohne dieses Passwort nicht anmelden kann."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Stärke"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "Dialog zur Passwort-Eingabe"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Erzwinge Änderung des Passwort bei nächster Anmeldung."
 
@@ -6548,8 +6100,7 @@ msgstr "UNIX-Name der Gruppe"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
+msgstr "Normalerweise werden IDs automatisch generiert. Auswählen um dies zu umgehen"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6664,6 +6215,11 @@ msgstr "Zeige Server"
 msgid "Show workstation"
 msgstr "Zeige Arbeitsstationen"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "Zeige Terminals"
@@ -6728,11 +6284,14 @@ msgstr "Name der Gruppe"
 msgid "Member objects"
 msgstr "Zusammengefasste Objekte"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Mehrfach bearbeiten"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Zeige Server"
 
-#~ msgid "In all groups"
-#~ msgstr "In allen Gruppen"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Zeige Arbeitsstationen"
 
-#~ msgid "Not in all groups"
-#~ msgstr "Nicht in allen Gruppen"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Zeige Terminals"
diff --git a/locale/es/fusiondirectory.po b/locale/es.po
similarity index 65%
rename from locale/es/fusiondirectory.po
rename to locale/es.po
index e2d3239c90db1aff17774f92341908112814341f..169b1ca0ea02ab52bb6f287d4e37d58fe0edf36a 100644
--- a/locale/es/fusiondirectory.po
+++ b/locale/es.po
@@ -1,55 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/es/)\n"
-"Language: es\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr "Opciones de FusionDirectory 3 de 3"
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr "Modificar parte del comportamiento central de FusionDirectory"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "No"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Si"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Error de configuración"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "¡El tiempo de vida de sesión debe ser un valor numérico!"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "¡Máximo tiempo de consulta LDAP debe ser un valor numérico!"
 
@@ -70,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permite seleccionar su idioma preferido"
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analizar el arbol LDAP actual por compatibilidad con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Comprobando objeto raíz"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "Analizando objetos en la entrada raíz"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Comprobando usuarios invisibles"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Comprobando súper administrador"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Comprobando cuentas fuera del árbol de usuarios"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Comprobando números GID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "Comprobando dispositivos por método antiguo"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "Comprobando servicios antiguos que deben ser migrados"
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "Comprobando por menús con estilo antiguo"
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Posiblemente el objeto raíz está desaparecido"
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -181,57 +178,56 @@ msgstr "Posiblemente el objeto raíz está desaparecido"
 msgid "Warning"
 msgstr "Aviso"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Encontrado '%s' valores duplicados del atributo 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Encontrado '%s' valores duplicados del atributo 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Mover"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "Encontrados '%s' usuario(s) fuera del árbol configurado '%s'."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Error"
 
@@ -239,56 +235,51 @@ msgstr "Error"
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-"El usuario especificado '%s' no tiene acceso total a la base de datos LDAP."
+msgstr "El usuario especificado '%s' no tiene acceso total a la base de datos LDAP."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr ""
-"Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
-"incompletos."
-
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+msgstr "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están incompletos."
+
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "No puede migrar el departamento '%s':"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"Se encontraron %s departamentos que no serán visibles en FusionDirectory"
+msgstr "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Cuentas administrativas de GOsa 2.5 encontradas: %s"
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
-msgstr ""
-"No hay una cuenta de administrador FusionDirectory 1.0 valida dentro de su "
+"There is no valid FusionDirectory 1.0 administrator account inside your "
 "LDAP."
+msgstr "No hay una cuenta de administrador FusionDirectory 1.0 valida dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -296,237 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Crear"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "No se puede añadir ACL para el usuario '%s':"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Error de entrada"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Error de contraseña"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "¡La contraseñas introducidas no  coinciden!"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "¡Por favor especifique un ID de usuario válido!"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "¡No puedo mover los usuarios al departamento especificado!"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "El grupo serán trasladado desde"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "También se actualizaran las siguientes referencias"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "El usuario serán trasladado desde"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"EL objeto raíz de LDAP ha desaparecido. Es necesario para poder usar el "
-"servicio LDAP."
+msgstr "EL objeto raíz de LDAP ha desaparecido. Es necesario para poder usar el servicio LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Intentando crear el objeto raíz"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
-msgstr ""
-"El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
+msgstr "El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Objeto '%s' de FusionDirectory faltante!"
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Por favor compruebe su instalación"
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
-"intente añadir la clase de objeto '%s' manualmente."
+msgstr "No se puede un tipo de objeto estructural en su entrada raíz. Por favor intente añadir la clase de objeto '%s' manualmente."
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Copia fallida de '%s' a '%s':"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Hay %s dispositivos que necesitan ser migrados."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "Añadiendo '%s' a LDAP ha fallado: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "Actualizando '%s' ha fallado: %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Hay %s serviccios que necesitan ser migrados."
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -534,13 +505,10 @@ msgstr "Añadir"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Eliminar"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Hay %s menu de aplicaciones que necesitan ser migrados."
@@ -580,22 +548,18 @@ msgstr "Por favor actualize a la versión soportada."
 
 #: setup/class_setupStep_Checks.inc:73
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr ""
-"FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
+msgstr "FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
 
 #: setup/class_setupStep_Checks.inc:81
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr ""
-"FusionDirectory requiere este modulo para una interfaz internacionalizada."
+msgstr "FusionDirectory requiere este modulo para una interfaz internacionalizada."
 
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr ""
-"FusionDirectory requiere este modulo para comunicarse con distintos tipos de "
-"servidores y protocolos."
+msgstr "FusionDirectory requiere este modulo para comunicarse con distintos tipos de servidores y protocolos."
 
 #: setup/class_setupStep_Checks.inc:97
 msgid "FusionDirectory requires this module for the samba integration."
@@ -605,14 +569,11 @@ msgstr "FusionDirectory requiere este modulo para la integración con Samba"
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr ""
-"FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
-"encripción SSHA"
+msgstr "FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar encripción SSHA"
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr ""
-"FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
+msgstr "FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "mbstring"
@@ -630,9 +591,7 @@ msgstr "MDB2"
 msgid ""
 "FusionDirectory requires this module to communicate with several supported "
 "databases."
-msgstr ""
-"FusionDirectory requiere este modulo para comunicarse con varias bases de "
-"datos soportadas."
+msgstr "FusionDirectory requiere este modulo para comunicarse con varias bases de datos soportadas."
 
 #: setup/class_setupStep_Checks.inc:134
 msgid ""
@@ -661,10 +620,7 @@ msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"registr_globals es un mecanismo de PHP para registrar todas las variables "
-"globales de tal manera que sean accesible desde scripts sin que cambien su "
-"ámbito. Esto puede ser un problema de seguridad."
+msgstr "registr_globals es un mecanismo de PHP para registrar todas las variables globales de tal manera que sean accesible desde scripts sin que cambien su ámbito. Esto puede ser un problema de seguridad."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
@@ -672,24 +628,19 @@ msgstr "Busque 'register_globals' en su php.ini y modifíquelo por 'Off'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
-"PHP usa este valor en el recolector de basura para eliminar las sesiones "
-"antiguas."
+msgstr "PHP usa este valor en el recolector de basura para eliminar las sesiones antiguas."
 
 #: setup/class_setupStep_Checks.inc:176
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Ajustando este valor a un día impedirá la perdida de sesiones y cookies "
-"antes de que realmente se desconecte por tiempo."
+msgstr "Ajustando este valor a un día impedirá la perdida de sesiones y cookies antes de que realmente se desconecte por tiempo."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
+msgstr "Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -721,9 +672,7 @@ msgstr ""
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
-"opción poniéndola en off para mejorar el rendimiento."
+msgstr "Esta opción está relacionada con el manejo de salida de PHP. Desactive esta opción poniéndola en off para mejorar el rendimiento."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
@@ -735,18 +684,15 @@ msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Aumente la seguridad del servidor modificando el parámetro 'expose_php' a "
-"'off'. PHP no debería enviar ningún tipo de información sobre el servidor "
-"que esta ejecutando la aplicación."
+msgstr "Aumente la seguridad del servidor modificando el parámetro 'expose_php' a 'off'. PHP no debería enviar ningún tipo de información sobre el servidor que esta ejecutando la aplicación."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
@@ -754,14 +700,13 @@ msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
+msgstr "Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -776,10 +721,7 @@ msgstr "No se puede escribir en la configuración"
 msgid ""
 "FusionDirectory reads its configuration from a file located in (%s/%s). The "
 "setup can write the configuration directly if it is writeable."
-msgstr ""
-"FusionDirectory lee su configuración desde un archivo localizado en (%s/%s). "
-"El proceso de instalación puede escribir la configuración directamente si el "
-"mismo es enscribible."
+msgstr "FusionDirectory lee su configuración desde un archivo localizado en (%s/%s). El proceso de instalación puede escribir la configuración directamente si el mismo es enscribible."
 
 #: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
 msgid "FusionDirectory settings 2/3"
@@ -801,9 +743,7 @@ msgstr "Conectividad LDAP"
 msgid ""
 "This dialog performs the basic configuration of the LDAP connectivity for "
 "FusionDirectory."
-msgstr ""
-"Este dialogo realiza la configuración básica de la conectividad LDAP para "
-"FusionDirectory"
+msgstr "Este dialogo realiza la configuración básica de la conectividad LDAP para FusionDirectory"
 
 #: setup/class_setupStep_Ldap.inc:117
 #, php-format
@@ -846,9 +786,7 @@ msgstr "Terminar - Escribir el archivo de configuración"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"El fichero de configuración es universalmente legible. ¡Por favor modifique "
-"los permisos del archivo!"
+msgstr "El fichero de configuración es universalmente legible. ¡Por favor modifique los permisos del archivo!"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -860,16 +798,13 @@ msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
-msgstr ""
-"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
-"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
-"mientras que otros usuarios no deben poder."
+msgstr "Después de descargar y colocar el archivo en %s, por favor asegúrese de que el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, mientras que otros usuarios no deben poder."
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Completado"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Siguiente"
 
@@ -909,69 +844,60 @@ msgstr "El Uid base debe ser un valor numérico"
 
 #: setup/class_setupStep_Config1.inc:137
 msgid "The given password minimum length is not numeric."
-msgstr ""
-"El valor indicado como longitud mínima de la contraseña no es un valor "
-"numérico."
+msgstr "El valor indicado como longitud mínima de la contraseña no es un valor numérico."
 
 #: setup/class_setupStep_Config1.inc:140
 msgid "The given password differ value is not numeric."
-msgstr ""
-"El valor indicado como diferencias mínimas de la contraseña no es un valor "
-"numérico."
+msgstr "El valor indicado como diferencias mínimas de la contraseña no es un valor numérico."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
-msgstr "Metodo de contraseña"
+msgstr "Método de contraseña"
 
 #: html/class_passwordRecovery.inc:127
 msgid "Error: Password method not available!"
 msgstr "Error: ¡El método de contraseñas no esta disponible!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
-msgstr "Error de configuración"
+msgstr "Error en la configuración"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir "
-"nueva contraseña'."
+msgstr "No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir nueva contraseña'."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -979,68 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "La sesión no será codificada."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr "No se encontró la cuenta %s"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr "Se encontraron varias cuentas %s"
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr "No existe una cuenta con el correo %s"
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr "Existen varias cuentas con el correo %s"
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-"Contacte a su administrador, hubo un problema con el servidor de correo"
+msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1051,152 +976,133 @@ msgstr "Smarty"
 #: html/main.php:136
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr ""
-"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
-"solucionarlo"
+msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solucionarlo"
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Configuración PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr ""
-"Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso "
-"hasta que esto sea solucionado por un administrador."
+msgstr "Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso hasta que esto sea solucionado por un administrador."
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
-msgstr ""
-"Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
+msgstr "Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "¡Funcionando sin memoria!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Desactivados chequeos de ACL de usuario"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Error de configuración"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"Error fatal: no todas las variables POST fueron transferidas por PHP - por "
-"favor informe a su administrador!"
+msgstr "Error fatal: no todas las variables POST fueron transferidas por PHP - por favor informe a su administrador!"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "¡La sesión no es codificada!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por "
-"el valor de ini de php."
+msgstr "El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por el valor de ini de php."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Error Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "¡Hay un problema con la configuración de autenticación!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"¡No se puede encontrar un usuario válido para la configuración de "
-"autenticación seleccionada!"
+msgstr "¡No se puede encontrar un usuario válido para la configuración de autenticación seleccionada!"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
-msgstr ""
-"La información de usuario no es única entre todos los arboles LDAP "
-"configurados"
+msgstr "La información de usuario no es única entre todos los arboles LDAP configurados"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
-msgstr ""
-"¡No se puede acceder a la información sobre los esuqemas LDAP instalados!"
+msgstr "¡No se puede acceder a la información sobre los esuqemas LDAP instalados!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Su configuración LDAP tiene definiciones de esquemas antiguos:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "¡Por favor introduzca un nombre de usuario válido!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr ""
-"¡No se puede recuperar la información de usuario para autenticación htaccess!"
+msgstr "¡No se puede recuperar la información de usuario para autenticación htaccess!"
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
-msgstr ""
-"Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
+msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y "
-"recargue esta página antes de iniciar sesión!"
+msgstr "Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y recargue esta página antes de iniciar sesión!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Información"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1207,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Seguridad"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1236,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Modificar información"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Inicio"
@@ -1264,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1276,13 +1178,12 @@ msgid "Password"
 msgstr "Contraseña"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Error de contraseña"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Nombre de equipo"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -1290,21 +1191,28 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Puerto"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Extensión"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Información personal"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1312,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Genérico"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1362,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Servidor"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Cliente ligero"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1455,469 +1360,461 @@ msgstr "Configuración"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Añadidos"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Idioma"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Tema"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Zona de uso horario"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Parámetros de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Usar caducidad de cuenta"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "Activar filtro de grupo primario"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Delegar en unidades administrativas"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Activar Copiar y Pegar"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Atributo de inicio de sesión"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Recordad los parámetros de filtro de los diálogos"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Instantaneas / Deshacer"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Activar instantaneas"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Base de instantaneas"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Métodos"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Incluir el título personal en el DN de usuario"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr "CN Modificado"
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "UIDs Automaticas"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1939,274 +1836,57 @@ msgstr "No se ha asignado ningún valor al campo 'Nueva contraseña'."
 
 #: plugins/personal/password/class_password.inc:117
 msgid "The password used as new and current are too similar."
-msgstr ""
-"La contraseña actual y la introducida como nueva son demasiado parecidas."
+msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
 #: plugins/personal/password/class_password.inc:119
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
-msgstr ""
-"Check-hook ha reportado un problema: %s. Cambio de contraseña cancelado!"
+msgstr "Check-hook ha reportado un problema: %s. Cambio de contraseña cancelado!"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "La contraseña introducida como contraseña actual no es correcta."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Cambiar contraseña de usuario"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr "¡Por favor añada una IP única o una combinación red/mascara!"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "mujer"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "hombre"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "¡No se puede subir el archivo!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr "El método de contraseña seleccionado no está disponible."
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
-"No se puede guardar la foto del usuario, FusionDirectory requiere que este "
-"instalado el paquete 'php5-imagick'"
-
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr "No se puede construir RDN: ¡no se permite + para construir subRDN!"
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "No se puede construir RDN: ¡Atributo no definido!"
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr "No se puede construir RDN: ¡Valor no válido del atributo!"
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
-"¡El método de contraseña seleccionado necesita una configuració inicial!"
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Nombre"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Nombre de pila"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Página Web"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Buscapersonas"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Fecha de nacimiento"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Unidad"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Tipo de Vía"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Profesión"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Última dirección conocida"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Lugar de residencia"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Descripción de la unidad"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Área de desarrollo"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Función"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Visible por todos"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Calle"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Rol"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Código Postal"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2217,122 +1897,76 @@ msgstr "Parámetros genéricos del usuario"
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Información personal"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Identificación de Usuario"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Nombre"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Titulación académica"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Fecha de nacimiento"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Idioma preferido"
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Base"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Foto del usuario"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Restricciones de entrada"
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organización"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Número del departamento"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2344,66 +1978,52 @@ msgstr "Número del departamento"
 msgid "Description"
 msgstr "Descripción"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
-msgstr "Gestor"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Número de empleado"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Categoría profesional"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Número de habitación"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Número de teléfono"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Número del busca"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Teléfono móvil"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Número de Fax"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Provincia"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2411,306 +2031,439 @@ msgstr "Provincia"
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:1409
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Provincia"
+
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Dirección"
+
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Número sala"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Número de habitación"
+
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Móvil"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Buscapersonas"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Información corporativa"
+
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organización"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Número departamento"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Número del departamento"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Número empleado"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Número de empleado"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Categoría profesional"
+
+#: plugins/personal/generic/class_user.inc:292
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Código Postal"
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr "Gestor"
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Teléfono privado"
+
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Metodo de contraseña de usuario"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Las entradas difieren"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "Editar características posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Editar características de correo electrónico"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Editar características samba"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Editar características telefónicas"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "Menú"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Editar propiedades iniciales del menú"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Entorno"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Editar características de entorno"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Nombre"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Grupo primario"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Estado"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Pertenencia a grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Cuenta"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "El usuario debe introducir la contraseña en el primer inicio de sesión"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Editar parametros de usuarios POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "Sin configurar"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "Periodo de gracia activado"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "activo"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "la contraseña expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Grupo de usuarios"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2807,14 +2560,7 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr ""
-"Saludos,\n"
-"Aquí están los datos solicitados:\n"
-"\n"
-"- Usuario: %s\n"
-"- Enlace: %s\n"
-"\n"
-"El enlace solo es valido por 10 minutos."
+msgstr "Saludos,\nAquí están los datos solicitados:\n\n- Usuario: %s\n- Enlace: %s\n\nEl enlace solo es valido por 10 minutos."
 
 #: plugins/admin/password/class_recoveryConfig.inc:111
 msgid "Second email"
@@ -2836,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2847,128 +2593,107 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr ""
-"Saludos,\n"
-"\n"
-"Su clave ha sido cambiada.\n"
-"Su nombre de usuario aun es %s."
+msgstr "Saludos,\n\nSu clave ha sido cambiada.\nSu nombre de usuario aun es %s."
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Nombre de la Organización"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Categoría"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Número de teléfono"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Base"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Parámetros administrativos"
+msgid "Postal address"
+msgstr "Código Postal"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Número de teléfono"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "Componentes del dominio"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
-"administrativa!"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Etiquetando '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Continuar"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Moviendo '%s' a '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Objeto"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Ha fallado a copiar %s, operación abortada"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Continuar"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Nombre de departamento"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Dirección"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "El objeto '%s' está ya marcado"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Añadir marca (%s) al objeto '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Eliminando marca del objeto '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Dominio"
 
@@ -2985,8 +2710,8 @@ msgstr "Componente del dominio"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "País"
 
@@ -2994,8 +2719,8 @@ msgstr "País"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Localidad"
 
@@ -3003,24 +2728,26 @@ msgstr "Localidad"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Acciones"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Editar"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Nombre del País"
@@ -3038,11 +2765,24 @@ msgid "List of users"
 msgstr "Lista de usuarios"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Plantilla"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Apellido"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Nombre de pila"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3054,7 +2794,7 @@ msgstr "Plantilla"
 msgid "Properties"
 msgstr "Propiedades"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Cambiar contraseña"
@@ -3075,15 +2815,15 @@ msgstr "Aplicar plantilla"
 msgid "New user from template"
 msgstr "Nuevo usuario desde plantilla"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "Eliminar usuario"
 
@@ -3091,58 +2831,56 @@ msgstr "Eliminar usuario"
 msgid "Manage users"
 msgstr "Gestión de usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
-msgstr "Permiso"
+msgstr "Permisos"
 
 #: plugins/admin/users/class_userManagement.inc:391
 msgid "You have no permission to change this users password!"
 msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
-msgstr "Error de Permisos"
+msgstr "Error de permisos"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido "
-"bloqueada!"
+msgstr "El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido bloqueada!"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3150,56 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"¡Añadir UID '%s' al grupo '%s ha fallado: no podemos encontrar el objeto "
-"usuario!"
+msgstr "¡Añadir UID '%s' al grupo '%s ha fallado: no podemos encontrar el objeto usuario!"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr "¡Añadir UID '%s' al grupo '%s ha fallado: UID es usado mas de una vez!"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "¡UID desconocido!"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s "
-"entradas!"
+msgstr "La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s entradas!"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "¡No se puede encontrar nigún SID para '%s'!"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "¡No se puede encontrar un RIDBASE para '%s'."
@@ -3213,23 +2947,23 @@ msgstr "¡El gidNumber '%s' introducido ya esta siendo usado por %s!"
 msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Tipo de grupo de samba"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Miembros de grupo de salto telefónico"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Grupo Nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Miembro del grupo"
 
@@ -3257,119 +2991,159 @@ msgstr "Eliminar grupo"
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "Editar características posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Editar características de correo electrónico"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Editar características samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Editar características telefónicas"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "Menú"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Editar propiedades iniciales del menú"
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Entorno"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Editar características de entorno"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Eliminar usuario"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Roles de control de acceso"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "Editar roles CA"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Todas las categorías"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Eliminar ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Un nivel"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Objeto actual"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Subárbol completo"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Subárbol completo (permanente)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Arriba"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Abajo"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "No hay ACL configuradas en esta categoría"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "Eliminar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Todos los objetos en el subárbol actual"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Objeto en uso"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Este Rol no puede ser eliminado por estar siendo usado por los siguientes "
-"objetos:"
+msgstr "Este Rol no puede ser eliminado por estar siendo usado por los siguientes objetos:"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Rol"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Roles de control de acceso"
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -3377,7 +3151,7 @@ msgstr "Permisos"
 msgid "List of acls"
 msgstr "Lista de acls"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "ACL"
@@ -3395,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "Plantillas ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
@@ -3415,59 +3189,68 @@ msgstr "Plantillas"
 msgid "Windows Install"
 msgstr "Instalación Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Cola telefónica"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Aplicaciones"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Inicio"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Sumario FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr "Cliente Argonaut"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Cola telefónica"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Aplicaciones"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Estos sistemas ya han sido configurados por otros grupos de objetos y no "
-"pueden ser añadidos:"
+msgstr "Estos sistemas ya han sido configurados por otros grupos de objetos y no pueden ser añadidos:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3477,9 +3260,7 @@ msgstr "Información"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"¡No puede combinar terminales y estaciones de trabajo en un unico grupo de "
-"objetos!"
+msgstr "¡No puede combinar terminales y estaciones de trabajo en un unico grupo de objetos!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3493,7 +3274,7 @@ msgstr "¡Solo se puede combiar dos tipos de objetos diferentes como máximo!"
 msgid "Object group generic"
 msgstr "Grupo de objetos genérico"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Miembro"
 
@@ -3522,40 +3303,34 @@ msgstr "Eliminar grupo de objetos"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"No hay definiciones de extensión para iniciar '%s', por favor compruebe su "
-"archivo de configuración."
+msgstr "No hay definiciones de extensión para iniciar '%s', por favor compruebe su archivo de configuración."
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "El proceso de eliminación ha sido cancelado por la extensión '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "Lista ordenada"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Eliminar esta entrada"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "en"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "En linea"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "Error XML"
 
@@ -3599,46 +3374,44 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"¡La generación de esta página ha provocado errores en el interprete PHP!"
+msgstr "¡La generación de esta página ha provocado errores en el interprete PHP!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr "Enviar informe de errores al equipo de FusionDirectory"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Enviar informe de errores"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Modificar información"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "error interno"
 
 #: include/class_session.inc:100 include/class_session.inc:137
 #: include/class_session.inc:175
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
+msgstr "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Mostrar roles"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
@@ -3646,103 +3419,135 @@ msgstr "No tiene permisos para crear una instantanea para %s."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Grupo de usuarios"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "Ninguno"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "¡'%s' debe ser menor que %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "¡'%s' debe ser menor que %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "¡No se puede subir el archivo!"
+msgstr "No puedo leer el archivo: %s"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "¡El certificado esta vacío!"
+msgstr "el archivo está vacío"
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "fichero no encontrado"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "fichero no accesible"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Recargar"
+msgstr "Enviar"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Abajo"
+msgstr "Descargar"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'"
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nombre de objeto"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3762,9 +3567,9 @@ msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 
 #: include/class_msgPool.inc:49 plugins/admin/ogroups/ogroup_objects.tpl.c:8
 msgid "Select to search within subtrees"
-msgstr "Seleccione para buscar dentro de subárboles"
+msgstr "Seleccione para buscar dentro de los subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
@@ -3900,114 +3705,113 @@ msgstr "¡El campo '%s' tiene una palabra reservada!"
 #: include/class_msgPool.inc:292
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr ""
-"¡El comando especificado como método %s para la extensión '%s' no existe!"
+msgstr "¡El comando especificado como método %s para la extensión '%s' no existe!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
-msgid "'%s' command is invalid!"
-msgstr "¡El comando '%s' no es válido!"
-
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "¡'%s' comando (%s) para la extensión %s no es válido!"
+msgid "'%s' command is invalid!"
+msgstr "¡El comando '%s' no es válido!"
 
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "¡'%s' comando para la extensión %s no es válido!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "¡'%s' comando (%s) no es válido!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "¡No se puede ejecutar el comando '%s'!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "¡'%s' comando (%s) para la extensión %s no es válido!"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "¡No se puede ejecutar el comando '%s' (%s) para la extensión %s!"
+msgid "Cannot execute '%s' command!"
+msgstr "¡No se puede ejecutar el comando '%s'!"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "¡No se puede ejecutar el comando '%s' para la extensión %s!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "¡No se puede ejecutar el comando '%s' (%s)!"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "¡No se puede ejecutar el comando '%s' (%s) para la extensión %s!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "¡El valor especificado como '%s' es demasiado grande!"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "¡'%s' debe ser menor que %s!"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "¡El valor especificado como '%s' es demasiado pequeño!"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "¡'%s' debe ser %d o superior!"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Ejemplo"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "El campo '%s' tiene caracteres no validos."
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "¡El campo '%s' tiene caracteres no validos!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4020,11 +3824,10 @@ msgstr "¡Extensión PHP %s no encontrada!"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4032,313 +3835,300 @@ msgstr "Cancelar"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Guardar"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Activar"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Activar %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
-"aquí"
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando aquí"
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
-"necesita eliminar las caracteristicas %s primero!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, necesita eliminar las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
-"aquí"
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando aquí"
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
-"necesita añadir las caracteristicas %s primero!"
+msgstr "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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"
+msgstr "Pulse en el botón - Editar - para cambiar la información en esta ventana"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr "Operación de base de datos fallida!"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
-"el archivo de configuración!"
+msgstr "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe el archivo de configuración!"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr ""
-"No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
-"faltante en su instalación de FusionDirectory?"
+msgstr "No se puede inicializar la clase '%s'! Posiblemente hay un complemento faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr "¡La base introducida no es válida, se ha dejado el valor anterior!"
@@ -4359,111 +4149,105 @@ msgstr "No se puede exportar a PDF: no se ha instalado la librería FPDF."
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No "
-"se puede crear la instancia del plugin!"
+msgstr "No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "¡El certificado esta vacío!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
-msgstr ""
-"¡No se puede cargar el certificado - solo se soportan certificados PEM/DER!"
+msgstr "¡No se puede cargar el certificado - solo se soportan certificados PEM/DER!"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr "¡No se puede extraer información de certificados que no sean PEM!"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "¡No ha cargado un certificado válido!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"No se puede conectar a LDAP: Por favor consulte con el administrador de "
-"sistemas."
+msgstr "No se puede conectar a LDAP: Por favor consulte con el administrador de sistemas."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "¡sambaSID y/o sambaRidBase no aparece en la configuración!"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
-"está activo."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no está activo."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"La funcionalidad de instancias esta activa, pero no se encuentra el módulo "
-"de compresión requerido. Por favor instale '%s'."
+msgstr "La funcionalidad de instancias esta activa, pero no se encuentra el módulo de compresión requerido. Por favor instale '%s'."
+
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Todas las categorías"
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Enviar"
 
@@ -4476,204 +4260,199 @@ msgstr "SASL"
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"¡No se puede encontrar un método de codificación válido para la clave "
-"introducida!"
+msgstr "¡No se puede encontrar un método de codificación válido para la clave introducida!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
-msgstr ""
-"El objeto ha cambiado desde que fue abierto en FusionDirectory. Todos los "
-"cambios que pudiera haber sido hechos por otros se perderán si guarda esta "
-"entrada!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr "El objeto ha cambiado desde que fue abierto en FusionDirectory. Todos los cambios que pudiera haber sido hechos por otros se perderán si guarda esta entrada!"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "Modificando ACL dn"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "desde"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "Todos los usuarios"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Eliminar ACLs"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Utilizar las ACL definidas en el rol"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "¡No hay ACL configuradas para esta categoría!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Tiene ACLs para estos objetos: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "Categoría ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Mostrar/ocultar caracteristicas avanzadas"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Crear objetos"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Eliminar Objetos"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Garantizar permiso al propietario"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "leer"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "escribir"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "Objeto completo"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "¡Tipo de ACL desconocido '%s'!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "¡Entrada desconocida '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Rol: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "rol desconocido"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Tiene configuraciones de los siguientes objetos: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Miembros"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "inactivo"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "Sin miembros"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Gestión de las Listas de control de acceso"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "Roles ACL"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Ir al departamento de usuarios"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -4696,327 +4475,288 @@ msgstr "¡Se ha indicado un objectType vacio o no válido!"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"El parámetro de zona horaria '%s' en fusiondirectory.conf no es válido. No "
-"se puede calcular una compensación correcta para la zona horaria."
+msgstr "El parámetro de zona horaria '%s' en fusiondirectory.conf no es válido. No se puede calcular una compensación correcta para la zona horaria."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"No se pueden crear automáticamente subárboles con RDN '%s': ¡No se ha "
-"encontrado la clase del objeto!"
+msgstr "No se pueden crear automáticamente subárboles con RDN '%s': ¡No se ha encontrado la clase del objeto!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr ""
-"No se pueden crear automáticamente subárboles con RDN '%s': no soportado"
+msgstr "No se pueden crear automáticamente subárboles con RDN '%s': no soportado"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "Falta el programa de la línea de comandos «%s»!"
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' "
-"en la linea %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' en la linea %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Ha habido un error importando dn: '%s', ¡Por favor compruebe su LDIF desde "
-"la línea %s en adelante!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Ha habido un error importando dn: '%s', ¡Por favor compruebe su LDIF desde la línea %s en adelante!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Por favor solucione el problema y actualize la página."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
-msgstr ""
-"¡El formato de la configuración ha cambiado. Por favor use el asistente de "
-"configuración!"
+msgstr "¡El formato de la configuración ha cambiado. Por favor use el asistente de configuración!"
 
 #: include/class_databaseManagement.inc:80
 msgid "Please activate debugging for details!"
 msgstr "¡Por favor active depuración para mas información!"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Va a eliminar la instantanea '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Eliminar instantanea"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Error fatal: no se han definido un emplazamiento para las clases - por favor "
-"ejecute '%s' para solucionar esto"
+msgstr "Error fatal: no se han definido un emplazamiento para las clases - por favor ejecute '%s' para solucionar esto"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
-"ejecutando '%s'"
+msgstr "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo ejecutando '%s'"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
+msgstr "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "¡El nombre de usuario / UID no es único dentro del árbol LDAP!"
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
-"contacte con su Administrador."
+msgstr "El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor contacte con su Administrador."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
-msgstr ""
-"Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
-"desarrolladores!"
+msgstr "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los desarrolladores!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte "
-"con su Administrador!"
+msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte con su Administrador!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
-"Esto no debería ocurrir - limpiando referencias multiples."
+msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
-"si se supera el límite máximo"
+msgstr "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje si se supera el límite máximo"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Entradas por página"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr "No se puede leer el archivo de revisión!"
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "No esta disponible 'baseIdHook'.¡Se usara la base predeterminada!"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"No puedo obtener información de esquemas del servidor. ¡No es posible "
-"comprobar los esquemas!"
+msgstr "No puedo obtener información de esquemas del servidor. ¡No es posible comprobar los esquemas!"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Usado para guardar información específica de la cuenta."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Usado para bloquear entradas editadas actualmente y así evitar múltiples "
-"cambios simultáneos."
+msgstr "Usado para bloquear entradas editadas actualmente y así evitar múltiples cambios simultáneos."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
-msgstr ""
-"¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
+msgstr "¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Ha activado la opción rfc2307bis en el paso 'configuración ldap', pero su "
-"configuración de esquemas no soporta esta opción."
+msgstr "Ha activado la opción rfc2307bis en el paso 'configuración ldap', pero su configuración de esquemas no soporta esta opción."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
-"debe ser AUXILIARY"
+msgstr "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' debe ser AUXILIARY"
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Su esquema está configurado para soportar grupos rfc2307bis, pero ha "
-"desactivado esta opción en el paso 'configuración ldap'."
+msgstr "Su esquema está configurado para soportar grupos rfc2307bis, pero ha desactivado esta opción en el paso 'configuración ldap'."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
-"existir."
+msgstr "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece existir."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "No se puede asignar un identificador (ID) libre:"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "¡método de asignación de id desconocido!"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "¡sambaUnixIdPool no es único!"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "¡No hay ID disponibles!"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "¡Excedido el número de intentos máximo!"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
@@ -5029,10 +4769,7 @@ msgid ""
 "The last interaction with the FusionDirectory web interface has been some "
 "time ago in the past. For security reasons, the session has been closed. To "
 "continue with administrative tasks, please sign in again."
-msgstr ""
-"La ultima interacción con la interfaz web de FusionDirectory ocurrió hace "
-"algún tiempo. Por razones de seguridad la sesión ha sido cerrada. Para "
-"continuar con las tareas administrativas, por favor entre nuevamente."
+msgstr "La ultima interacción con la interfaz web de FusionDirectory ocurrió hace algún tiempo. Por razones de seguridad la sesión ha sido cerrada. Para continuar con las tareas administrativas, por favor entre nuevamente."
 
 #: ihtml/themes/default/logout.tpl.c:8
 msgid "Sign in again"
@@ -5046,9 +4783,7 @@ msgstr "Pantalla de inicio"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
-"sistema de administración."
+msgstr "Por favor use su nombre de usuario y contraseña para iniciar sesión en el sistema de administración."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5081,7 +4816,6 @@ msgstr "Pulse aquí para iniciar sesión"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5091,6 +4825,7 @@ msgstr "Pulse aquí para iniciar sesión"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
 
@@ -5102,21 +4837,15 @@ msgstr "Detectado conflicto de sesiones."
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Probablemente exista otra instancia activa de sus sesión. Operaciones en "
-"ventanas múltiples no son técnicamente posibles y dependen  del navegador "
-"utilizado. El uso de diferentes navegadores a la vez (por ejemplo: IE y "
-"Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Probablemente exista otra instancia activa de sus sesión. Operaciones en ventanas múltiples no son técnicamente posibles y dependen  del navegador utilizado. El uso de diferentes navegadores a la vez (por ejemplo: IE y Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Ignorando este mensaje cambiara/eliminara los datos que esta actualmente "
-"editando. Por favor, cierre las otras ventanas y vuelva a entrar."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Ignorando este mensaje cambiara/eliminara los datos que esta actualmente editando. Por favor, cierre las otras ventanas y vuelva a entrar."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5136,8 +4865,7 @@ msgstr "Métodos disponibles"
 
 #: ihtml/themes/default/recovery.tpl.c:17
 msgid "Receive by email a link that allows you to reset your password"
-msgstr ""
-"Recibir por correo electrónico una dirección que permite cambiar la clave"
+msgstr "Recibir por correo electrónico una dirección que permite cambiar la clave"
 
 #: ihtml/themes/default/recovery.tpl.c:20
 msgid "Send"
@@ -5149,19 +4877,15 @@ msgstr "Seleccione aquí para enviar una dirección de cambio de clave "
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
-msgstr ""
-"Si ninguno de los métodos anteriores le funciona, contacte a su "
-"administrador para cambiar su clave"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr "Si ninguno de los métodos anteriores le funciona, contacte a su administrador para cambiar su clave"
 
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Este dialogo provee un método sencillo para cambiar su clave. Introduzca la "
-"clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
+msgstr "Este dialogo provee un método sencillo para cambiar su clave. Introduzca la clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
 
 #: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
@@ -5173,11 +4897,11 @@ msgstr "Repita la nueva contraseña"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
-msgstr "Seguridad de contraseña"
+msgstr "Resistencia de la contraseña"
 
 #: ihtml/themes/default/recovery.tpl.c:56
 #: ihtml/themes/default/recovery.tpl.c:89
@@ -5207,16 +4931,12 @@ msgstr "Su contraseña se ha cambiado correctamente."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr ""
-"Introduzca su dirección de correo actual en el campo debajo y presione el "
-"botón 'Cambiar'"
+msgstr "Introduzca su dirección de correo actual en el campo debajo y presione el botón 'Cambiar'"
 
 #: ihtml/themes/default/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr ""
-"=> Utilice el formato largo de su correo, ej: Pedro Pérez => pedro."
-"perez@dominio.com"
+msgstr "=> Utilice el formato largo de su correo, ej: Pedro Pérez => pedro.perez@dominio.com"
 
 #: ihtml/themes/default/recovery.tpl.c:95
 msgid ""
@@ -5245,9 +4965,7 @@ msgstr ""
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"No olvide comprobar referencias a otros objetos, por ejemplo ¿todavía "
-"existen las impresoras seleccionadas?"
+msgstr "No olvide comprobar referencias a otros objetos, por ejemplo ¿todavía existen las impresoras seleccionadas?"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5255,9 +4973,7 @@ msgstr "No hay instantaneas disponibles que puedan ser recuperadas"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Elija una instantanea y pulse en la imagen carpeta, para recuperar la "
-"instantanea"
+msgstr "Elija una instantanea y pulse en la imagen carpeta, para recuperar la instantanea"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5268,18 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Este procedimiento creará una instantánea de los objetos seleccionados. "
-"Serán guardados dentro de una carpeta especial de sus sistema de archivos y "
-"podrán recuperados posteriormente."
+msgstr "Este procedimiento creará una instantánea de los objetos seleccionados. Serán guardados dentro de una carpeta especial de sus sistema de archivos y podrán recuperados posteriormente."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Recuerde que las entradas de base de datos, configuración DNS y zonas "
-"creadas en extensiones de servidor no serán guardadas en la instantánea."
+msgstr "Recuerde que las entradas de base de datos, configuración DNS y zonas creadas en extensiones de servidor no serán guardadas en la instantánea."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5294,18 +5005,14 @@ msgstr "Razón para generar esta instantánea"
 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."
+msgstr "Por favor verifique si realmente quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
 
 #: ihtml/themes/default/simple-remove.tpl.c:8
 #: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5316,10 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
-"mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, "
-"pulsando en el botón <i>Eliminar</i>."
+msgstr "Si esta detección de bloqueo es falsa, la otra persona cerro su navegador mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, pulsando en el botón <i>Eliminar</i>."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5327,16 +5031,11 @@ msgstr "Solo lectura"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de tener una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la búsqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que este buscando."
+msgstr "La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y protege al servidor LDAP de tener una mayor carga. La manera mas fácil de manipular grandes bases de datos sin grandes perdidas de tiempo es limitar la búsqueda a valores pequeños y usar filtros para encontrar las entradas que este buscando."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5344,16 +5043,13 @@ msgstr "Por favor elija la forma de reaccionar en esta sesión"
 
 #: ihtml/themes/default/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignore este error y muestre todas las entradas devueltas por el servidor LDAP"
+msgstr "ignore este error y muestre todas las entradas devueltas por el servidor LDAP"
 
 #: ihtml/themes/default/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"ignore este error y muestre todas las entradas que coincidan con el tamaño "
-"limite definido y active el uso de filtros en su lugar"
+msgstr "ignore este error y muestre todas las entradas que coincidan con el tamaño limite definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5421,17 +5117,11 @@ msgstr "Entrando"
 msgid "Session expires in %d!"
 msgstr "La sesión expira en %d!"
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "Menú principal de FusionDirectory"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Esto puede ser utilizado por varios grupos. Por favor verifique si realmente "
-"quiere hacer esto ya que FusionDirectory no tiene forma de recuperar su data."
+msgstr "Esto puede ser utilizado por varios grupos. Por favor verifique si realmente quiere hacer esto ya que FusionDirectory no tiene forma de recuperar su data."
 
 #: ihtml/themes/default/logout-close.tpl.c:2
 msgid "Your FusionDirectory session has been closed!"
@@ -5441,9 +5131,7 @@ msgstr "¡Su sesión de FusionDirectory se ha cerrado!"
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Por favor cierre la ventana del navegador y limpie la cache para evitar una "
-"reautentificación automática de su navegador."
+msgstr "Por favor cierre la ventana del navegador y limpie la cache para evitar una reautentificación automática de su navegador."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5451,20 +5139,17 @@ msgstr "Cambie su contraseña"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Este dialogo le permite cambiar de forma sencilla la contraseña. Introduzca "
-"la contraseña actual y la nueva contraseña (dos veces) en los campos "
-"siguientes y presione en el botón 'Cambiar'."
+msgstr "Este dialogo le permite cambiar de forma sencilla la contraseña. Introduzca la contraseña actual y la nueva contraseña (dos veces) en los campos siguientes y presione en el botón 'Cambiar'."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Contraseña actual"
 
@@ -5477,24 +5162,17 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr ""
-"Algunos valores deben ser únicos en el directorio completo mientras que "
-"algunas combinaciones no tienen sentido. FusionDirectory muestra los "
-"atributos relevantes. Por favor mantenga los valores de abajo para cumplir "
-"con las políticas."
+msgstr "Algunos valores deben ser únicos en el directorio completo mientras que algunas combinaciones no tienen sentido. FusionDirectory muestra los atributos relevantes. Por favor mantenga los valores de abajo para cumplir con las políticas."
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
+msgstr "¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr ""
-"O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente, "
-"puede resultar en errores al pegar el objeto nuevamente!"
+msgstr "O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente, puede resultar en errores al pegar el objeto nuevamente!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5516,8 +5194,7 @@ msgstr "Confirmar contraseña"
 
 #: setup/setup_ldap.tpl.c:2
 msgid "Please choose the LDAP user to be used by FusionDirectory"
-msgstr ""
-"Por favor seleccione el usuario LDAP a ser utilizado por FusionDirectory"
+msgstr "Por favor seleccione el usuario LDAP a ser utilizado por FusionDirectory"
 
 #: setup/setup_ldap.tpl.c:5
 msgid "Search"
@@ -5613,10 +5290,7 @@ msgid ""
 "FusionDirectory supports several encryption types for your passwords. "
 "Normally this is adjustable via user templates, but you can specify a "
 "default method to be used here, too."
-msgstr ""
-"FusionDirectory soporta varios tipos de encripción para sus claves. "
-"Normalmente esto es ajustable mediante las plantillas de usuario, pero puede "
-"también especificar un método por defecto aquí."
+msgstr "FusionDirectory soporta varios tipos de encripción para sus claves. Normalmente esto es ajustable mediante las plantillas de usuario, pero puede también especificar un método por defecto aquí."
 
 #: setup/setup_config1.tpl.c:68
 msgid ""
@@ -5624,44 +5298,28 @@ msgid ""
 "This is a workaround till OpenLDAP's in directory ACI's are    fully "
 "implemented. For this to work, we need the admin DN and the corresponding "
 "password."
-msgstr ""
-"FusionDirectory siempre actúa como administrador y maneja los derechos de "
-"acceso internamente. Esto es un atajo hasta que los ACLs definidos en "
-"directorio en OpenLDAP estén completamente implementados. Para que esto "
-"funcione, necesitamos el DN del administrador y su clave correspondiente."
+msgstr "FusionDirectory siempre actúa como administrador y maneja los derechos de acceso internamente. Esto es un atajo hasta que los ACLs definidos en directorio en OpenLDAP estén completamente implementados. Para que esto funcione, necesitamos el DN del administrador y su clave correspondiente."
 
 #: setup/setup_config1.tpl.c:71
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where "
 "FusionDirectory saves people and groups, including the way accounts get "
 "created. Check the values below if the fit your needs."
-msgstr ""
-"Algunos parámetros básicos de LDAP son ajustables y afectan las locaciones "
-"donde FusionDirectory guarda grupos y usuarios, incluyendo la forma en que "
-"las cuentas son creadas. Revise los valores debajo para ajustarlos a sus "
-"necesidades."
+msgstr "Algunos parámetros básicos de LDAP son ajustables y afectan las locaciones donde FusionDirectory guarda grupos y usuarios, incluyendo la forma en que las cuentas son creadas. Revise los valores debajo para ajustarlos a sus necesidades."
 
 #: setup/setup_config1.tpl.c:74
 msgid ""
 "FusionDirectory has modular support for several mail methods. These methods "
 "provide interfaces to users mailboxes and general handling    for quotas. "
 "You can choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"FusionDirectory tiene soporte modular para varios métodos de correo. Estos "
-"métodos proveen interfaces a los buzones de los usuarios y el manejo general "
-"de las cuotas. Puede seleccionar el complemento \"dummy\" para mantener su "
-"configuración de correo intacta."
+msgstr "FusionDirectory tiene soporte modular para varios métodos de correo. Estos métodos proveen interfaces a los buzones de los usuarios y el manejo general de las cuotas. Puede seleccionar el complemento \"dummy\" para mantener su configuración de correo intacta."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
-msgstr ""
-"Durante la inspección del LDAP vamos a verificar varios problemas comunes "
-"que pueden ocurrir durante la migración a administración por FusionDirectory "
-"de la base LDAP. Puede querer reparar los problemas debajo, para proveer un "
-"servicio mas eficiente."
+msgstr "Durante la inspección del LDAP vamos a verificar varios problemas comunes que pueden ocurrir durante la migración a administración por FusionDirectory de la base LDAP. Puede querer reparar los problemas debajo, para proveer un servicio mas eficiente."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -5697,19 +5355,14 @@ msgstr "Mover grupos en el árbol de grupos configurado"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Este dialogo le permite mover una pareja de grupos al árbol de grupos "
-"configurados. Hacer esto puede reforzar su servicio LDAP."
+msgstr "Este dialogo le permite mover una pareja de grupos al árbol de grupos configurados. Hacer esto puede reforzar su servicio LDAP."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos "
-"grupos. La instalación de FusionDirectory no puede migrar referencias, así "
-"que puede querer cancelar la migración en estos casos."
+msgstr "Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos grupos. La instalación de FusionDirectory no puede migrar referencias, así que puede querer cancelar la migración en estos casos."
 
 #: setup/setup_migrate.tpl.c:32
 msgid "Move selected groups into this group tree"
@@ -5737,19 +5390,14 @@ msgstr "Mover usuarios al árbol de usuarios configurado"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Este dialogo le permite mover una pareja de usuarios al árbol de usuarios "
-"configurados. Hacer esto puede reforzar su servicio LDAP."
+msgstr "Este dialogo le permite mover una pareja de usuarios al árbol de usuarios configurados. Hacer esto puede reforzar su servicio LDAP."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos "
-"usuarios. La instalación de FusionDirectory no puede migrar referencias, así "
-"que puede querer cancelar la migración en estos casos."
+msgstr "Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos usuarios. La instalación de FusionDirectory no puede migrar referencias, así que puede querer cancelar la migración en estos casos."
 
 #: setup/setup_migrate.tpl.c:59
 msgid "Move selected users into this people tree"
@@ -5763,9 +5411,7 @@ msgstr "Migrar cuentas administrativas GOsa versión 2.5"
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into "
 "FusionDirectory 1.0 useable accounts."
-msgstr ""
-"Este dialogo permite la migración de las cuentas administrador de GOsa 2.5 a "
-"cuentas utilizables por FusionDirectory 1.0."
+msgstr "Este dialogo permite la migración de las cuentas administrador de GOsa 2.5 a cuentas utilizables por FusionDirectory 1.0."
 
 #: setup/setup_migrate.tpl.c:107
 msgid "Abort"
@@ -5779,9 +5425,7 @@ msgstr "Crear una nueva cuenta administrador de FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol "
-"LDAP."
+msgstr "Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol LDAP."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
@@ -5796,10 +5440,7 @@ msgid ""
 "The listed departments are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of entries, select them "
 "and use the migrate button below."
-msgstr ""
-"Los departamentos listados son actualmente invisibles en la interfaz de "
-"usuario de FusionDirectory. Si quiere cambiar esto para algunas entradas, "
-"selecciónelas y utilice el botón de \"migrar\" debajo."
+msgstr "Los departamentos listados son actualmente invisibles en la interfaz de usuario de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
 #: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
@@ -5807,34 +5448,26 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Si quiere saber que se hará cuando se migren las entradas seleccionadas use "
-"el botón 'Mostrar cambios' para ver el LDIF."
+msgstr "Si quiere saber que se hará cuando se migren las entradas seleccionadas use el botón 'Mostrar cambios' para ver el LDIF."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
 "The listed users are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of users, just select "
 "them and use the 'Migrate' button below."
-msgstr ""
-"Los usuarios listados son actualmente invisibles en la interfaz de usuario "
-"de FusionDirectory. Si quiere cambiar esto para algunas entradas, "
-"selecciónelas y utilice el botón de \"migrar\" debajo."
+msgstr "Los usuarios listados son actualmente invisibles en la interfaz de usuario de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Los dispositivos listados son actualmente invisibles en la interfaz de "
-"FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas "
-"y utilice el botón de \"migrar\" debajo."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr "Los dispositivos listados son actualmente invisibles en la interfaz de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "Refresco"
 
@@ -5843,20 +5476,14 @@ msgid ""
 "The listed services are currently invalid for the FusionDirectory version "
 "you are going to install. If you want to update a couple of service, just "
 "select them and use the 'Migrate' button below."
-msgstr ""
-"Los servicios listados son actualmente inválidos para la versión de "
-"FusionDirectory que va a instalar. Si quiere actualizar algunos servicios, "
-"selecciónelos y utilice el botón de \"migrar\" debajo."
+msgstr "Los servicios listados son actualmente inválidos para la versión de FusionDirectory que va a instalar. Si quiere actualizar algunos servicios, selecciónelos y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Los menús listados son actualmente invisibles en la interfaz de "
-"FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas "
-"y utilice el botón de \"migrar\" debajo."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr "Los menús listados son actualmente invisibles en la interfaz de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_feedback.tpl.c:2
 msgid "Feedback successfully send"
@@ -5876,11 +5503,9 @@ msgstr "Enviar comentarios al equipo del proyecto FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
-msgstr ""
-"Cuando se selecciona esta opción, FusionDirectory intentará conectar con "
-"http://www.fusiondirectory.org para enviar su formulario de manera anónima."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr "Cuando se selecciona esta opción, FusionDirectory intentará conectar con http://www.fusiondirectory.org para enviar su formulario de manera anónima."
 
 #: setup/setup_feedback.tpl.c:26
 msgid "Did the setup procedure help you to get started?"
@@ -5939,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr "Que capacidades de FusionDirectory utiliza?"
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr "Que capacidades desea ver en versiones futuras de FusionDirectory?"
 
 #: setup/setup_feedback.tpl.c:83
@@ -5953,12 +5579,9 @@ msgstr "Por favor seleccione su idioma preferido"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"En este punto, puede seleccionar el idioma usado por defecto. Seleccionando "
-"'automático' obtendrá el lenguaje usado por el navedador. Esta configuración "
-"puede ser modificada por cada usuario."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "En este punto, puede seleccionar el idioma usado por defecto. Seleccionando 'automático' obtendrá el lenguaje usado por el navedador. Esta configuración puede ser modificada por cada usuario."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -5972,27 +5595,27 @@ msgstr "Por favor introduzca su zona horaria preferida aquí"
 msgid "FusionDirectory core settings"
 msgstr "Configuración central de FusionDirectory"
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Activar edición de bloqueo"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr "Registros de FusionDirectory"
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Forzar register_globals para que sea desactivado"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Mostrar errores PHP:"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Activado"
 
@@ -6013,10 +5636,7 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr ""
-"Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos "
-"ninguna configuración hasta el momento. Este simple asistente trata de "
-"ayudarlo a configurar."
+msgstr "Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos ninguna configuración hasta el momento. Este simple asistente trata de ayudarlo a configurar."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -6048,9 +5668,7 @@ msgstr "Encontrar cada posible error de configuración"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr ""
-"Migración asistidas de cualquier configuración LDAP - ¡creando copias de "
-"seguridad!"
+msgstr "Migración asistidas de cualquier configuración LDAP - ¡creando copias de seguridad!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue..."
@@ -6062,11 +5680,7 @@ msgid ""
 "creating the file '/tmp/fusiondirectory.auth', containing the current "
 "session ID on the servers local filesystem. This can be done by executing "
 "the following command:"
-msgstr ""
-"Por razones de seguridad debe autenticarse para la instalación creando el "
-"archivo '/tmp/fusiondirectory.auth', conteniendo el ID de la sesión actual "
-"en el sistema de archivos del servidor. Esto puede ser hecho ejecutando el "
-"siguiente comando: "
+msgstr "Por razones de seguridad debe autenticarse para la instalación creando el archivo '/tmp/fusiondirectory.auth', conteniendo el ID de la sesión actual en el sistema de archivos del servidor. Esto puede ser hecho ejecutando el siguiente comando: "
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -6114,11 +5728,9 @@ msgstr "Ha fallado la comprobación del esquema"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"No se puede acceder a la información de esquemas, todos las comprobaciones "
-"se suspenden. Ajuste las acl de ldap."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "No se puede acceder a la información de esquemas, todos las comprobaciones se suspenden. Ajuste las acl de ldap."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
@@ -6167,9 +5779,7 @@ msgstr "Este objeto no tiene relación con otros objetos"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en "
-"todos los programas configurados también."
+msgstr "Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en todos los programas configurados también."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6182,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Para cambiar su contraseña personal use los campos siguientes. Los cambios "
-"tendrán efecto inmediato. Por favor memorice la nueva contraseña, porque no "
-"podrá entrar sin ella."
+msgstr "Para cambiar su contraseña personal use los campos siguientes. Los cambios tendrán efecto inmediato. Por favor memorice la nueva contraseña, porque no podrá entrar sin ella."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6193,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Cambiar la contraseña modifica la autenticación del usuario para el correo, "
-"proxy, samba y los servicios unix."
+msgstr "Cambiar la contraseña modifica la autenticación del usuario para el correo, proxy, samba y los servicios unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "Su contraseña ha caducado. ¡Por favor seleccione una nueva!"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
-msgstr "Reintroducir nueva contraseña"
+msgstr "Reintroduzca la contraseña"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Diálogo de cambio de contraseña"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "Usar propuesta"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "Especificar una contraseña manualmente"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Introducir contraseña"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Limpiar información"
 
@@ -6241,55 +5841,10 @@ msgstr "Limpiar información"
 msgid "Your password hash method will not be changed!"
 msgstr "No se cambiará su método de hash de la contraseña!"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificados"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Certificado estándar"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Certificado S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Certificado PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Número de serie del certificado"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Foto"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Eliminar foto"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Caracteristicas del usuario"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Apellido"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Nombre"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Borrar Contraseña"
@@ -6298,59 +5853,17 @@ msgstr "Borrar Contraseña"
 msgid "Set new password"
 msgstr "Introducir nueva contraseña"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Información personal"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Cambiar foto"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nombre de la plantilla"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Idioma preferido"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Teléfono privado"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Almacén de claves"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Restringir inicio de sesión a"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP o Red"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Información corporativa"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Número departamento"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Número empleado"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Foto"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Número sala"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Foto del usuario"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Por favor use la sección telefóno"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Eliminar foto"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6367,23 +5880,6 @@ msgstr "Mostrar grupos de samba"
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr "Mostrar Computadora Windows"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6402,15 +5898,6 @@ msgstr "Nombre de la localidad a crear"
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Marcar departamento como una unidad administrativa independiente"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Procesando la operación solicitada"
@@ -6419,9 +5906,7 @@ msgstr "Procesando la operación solicitada"
 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."
+msgstr "Su navegador no soporta IFRAMES, porfavor use este enlace para ejecutar la operación solicitada."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6435,9 +5920,7 @@ msgstr "Está actualmente moviendo/renombrando este departamento."
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"Modificar un atributo 'ou' de un departamento puede corromper acls e "
-"instantaneas de todos los objetos."
+msgstr "Modificar un atributo 'ou' de un departamento puede corromper acls e instantaneas de todos los objetos."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6447,9 +5930,7 @@ msgstr "FusionDirectory NO puede reparar esto por usted, aun. "
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Antes de que confirme la acción, asegurese que todo sera como espera, se "
-"recomienda que realize un backup."
+msgstr "Antes de que confirme la acción, asegurese que todo sera como espera, se recomienda que realize un backup."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6494,20 +5975,14 @@ msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. 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 cuentas, sistemas, etc. en este sub-árbol. Por "
-"favor verifique si realmente quiere hacer esto ya que no hay forma para que "
-"FusionDirectory recupere la data."
+msgstr "Esto incluye 'todas' las cuentas, sistemas, etc. en este sub-árbol. Por favor verifique si realmente quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
 
 #: plugins/admin/departments/remove.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."
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6537,9 +6012,7 @@ msgstr "Aplicando una plantilla"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Aplicar una plantilla a usuarios reemplazará los valores de estos por los "
-"definidos en la plantilla."
+msgstr "Aplicar una plantilla a usuarios reemplazará los valores de estos por los definidos en la plantilla."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6554,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Crear un nuevo usuario es mas fácil si usa plantillas. Algunos valores en la "
-"base de datos serán introducidos automáticamente. Elegir 'ninguno' para "
-"anular el uso de plantillas."
+msgstr "Crear un nuevo usuario es mas fácil si usa plantillas. Algunos valores en la base de datos serán introducidos automáticamente. Elegir 'ninguno' para anular el uso de plantillas."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6581,33 +6051,23 @@ msgstr "Mostrar los usuarios samba"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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."
 
 #: plugins/admin/users/password.tpl.c:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Para cambiar la contraseña del usuario use los campos a continuación. Los "
-"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
-"contraseña, el usuario no podrá autenticarse sin ella."
+msgstr "Para cambiar la contraseña del usuario use los campos a continuación. Los cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Seguridad"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "Dialogo de entrada de clave"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Forzar el cambio de contraseña en el próximo inicio."
 
@@ -6640,9 +6100,7 @@ msgstr "Nombre Posix del grupo"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalmente los IDs son generados automáticamente, seleccione para indicar "
-"manualmente"
+msgstr "Normalmente los IDs son generados automáticamente, seleccione para indicar manualmente"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6658,10 +6116,7 @@ msgstr "Forzar número ID"
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Este puede ser un grupo primario de usuario. Por favor verifique si "
-"realmente quiere hacer esto ya que no hay forma para que FusionDirectory "
-"recupere la data."
+msgstr "Este puede ser un grupo primario de usuario. Por favor verifique si realmente quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
 
 #: plugins/admin/groups/trust_machines.tpl.c:2
 #: plugins/admin/ogroups/trust_machines.tpl.c:2
@@ -6693,7 +6148,7 @@ msgstr "Mostrar sistemas que coincidan con"
 #: plugins/admin/groups/trust_machines.tpl.c:17
 #: plugins/admin/ogroups/trust_machines.tpl.c:17
 msgid "Regular expression for matching addresses"
-msgstr "Expresiones regulares para buscar direcciones"
+msgstr "Expresión regular para buscar direcciones"
 
 #: plugins/admin/groups/generic.tpl.c:11
 #: plugins/admin/ogroups/generic.tpl.c:11
@@ -6760,6 +6215,11 @@ msgstr "Mostrar servidor"
 msgid "Show workstation"
 msgstr "Mostrar estación de trabajo"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr "Mostrar Computadora Windows"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "Mostrar terminal"
@@ -6824,11 +6284,14 @@ msgstr "Nombre del grupo"
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Edición multiple"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Mostrar servidores"
 
-#~ msgid "In all groups"
-#~ msgstr "en todos los grupos"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
 
-#~ msgid "Not in all groups"
-#~ msgstr "no en todos los grupos"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Mostrar terminales"
diff --git a/locale/es_VE/fusiondirectory.po b/locale/es_VE.po
similarity index 65%
rename from locale/es_VE/fusiondirectory.po
rename to locale/es_VE.po
index bf23acff7a6e5d0ecc0bac198df366bf10abb6fc..638d7462444ced4db00487703d2691dd680a5e75 100644
--- a/locale/es_VE/fusiondirectory.po
+++ b/locale/es_VE.po
@@ -1,55 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# lars_g <lars.gold@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/"
-"FusionDirectory/language/es_VE/)\n"
-"Language: es_VE\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr "Opciones de FusionDirectory 3 de 3"
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr "Modificar parte del comportamiento central de FusionDirectory"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "No"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Si"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Error de configuración"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "¡El tiempo de vida de sesión debe ser un valor numérico!"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "¡Máximo tiempo de consulta LDAP debe ser un valor numérico!"
 
@@ -70,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Este paso le permite seleccionar su idioma preferido"
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "Inspección LDAP"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analizar el arbol LDAP actual por compatibilidad con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Comprobando objeto raíz"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "Analizando objetos en la entrada raíz"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Comprobando departamentos invisibles"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Comprobando usuarios invisibles"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Comprobando súper administrador"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Comprobando cuentas fuera del árbol de usuarios"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Comprobando grupos fuera del árbol de grupos"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Comprobando números UID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Comprobando números GID duplicados"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "Comprobando dispositivos por método antiguo"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "Comprobando servicios antiguos que deben ser migrados"
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "Comprobando por menús con estilo antiguo"
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "La consulta LDAP ha fallado"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Posiblemente el objeto raíz está desaparecido"
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -181,57 +178,56 @@ msgstr "Posiblemente el objeto raíz está desaparecido"
 msgid "Warning"
 msgstr "Aviso"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Encontrado '%s' valores duplicados del atributo 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Encontrado '%s' valores duplicados del atributo 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Encontrados '%s' grupos fuera del árbol configurado '%s'."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Mover"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "Encontrados '%s' usuario(s) fuera del árbol configurado '%s'."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Error"
 
@@ -239,56 +235,51 @@ msgstr "Error"
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-"El usuario especificado '%s' no tiene acceso total a la base de datos LDAP."
+msgstr "El usuario especificado '%s' no tiene acceso total a la base de datos LDAP."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr ""
-"Se encontraron %s usuarios que no serán visibles en FusionDirectory o están "
-"incompletos."
-
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+msgstr "Se encontraron %s usuarios que no serán visibles en FusionDirectory o están incompletos."
+
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Migrar"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Error de migración"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "No puede migrar el departamento '%s':"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"Se encontraron %s departamentos que no serán visibles en FusionDirectory"
+msgstr "Se encontraron %s departamentos que no serán visibles en FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Cuentas administrativas de GOsa 2.5 encontradas: %s"
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
-msgstr ""
-"No hay una cuenta de administrador FusionDirectory 1.0 valida dentro de su "
+"There is no valid FusionDirectory 1.0 administrator account inside your "
 "LDAP."
+msgstr "No hay una cuenta de administrador FusionDirectory 1.0 valida dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -296,237 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Crear"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Usuarios"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "No hay una cuenta de administrador FusionDirectory dentro de su LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "No se puede añadir ACL para el usuario '%s':"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Error de entrada"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Error de contraseña"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "¡La contraseñas introducidas no  coinciden!"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "¡Por favor especifique un ID de usuario válido!"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Error"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "Ha fallado al añadir un usuario administrativo: ¡El objeto '%s' ya existe!"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
-msgstr "Error LDAP"
+msgstr "Error de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "¡No puedo mover los usuarios al departamento especificado!"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "El grupo serán trasladado desde"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "a"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "También se actualizaran las siguientes referencias"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "El usuario serán trasladado desde"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "Las siguientes referencias se actualizaran"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"EL objeto raíz de LDAP ha desaparecido. Es necesario para poder usar el "
-"servicio LDAP."
+msgstr "EL objeto raíz de LDAP ha desaparecido. Es necesario para poder usar el servicio LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Intentando crear el objeto raíz"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
-msgstr ""
-"El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
+msgstr "El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Objeto '%s' de FusionDirectory faltante!"
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Por favor compruebe su instalación"
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
-"intente añadir la clase de objeto '%s' manualmente."
+msgstr "No se puede un tipo de objeto estructural en su entrada raíz. Por favor intente añadir la clase de objeto '%s' manualmente."
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Copia fallida de '%s' a '%s':"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Hay %s dispositivos que necesitan ser migrados."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "Añadiendo '%s' a LDAP ha fallado: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "Actualizando '%s' ha fallado: %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Hay %s serviccios que necesitan ser migrados."
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Añadir"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -534,13 +505,10 @@ msgstr "Añadir"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Eliminar"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Hay %s menu de aplicaciones que necesitan ser migrados."
@@ -580,22 +548,18 @@ msgstr "Por favor actualize a la versión soportada."
 
 #: setup/class_setupStep_Checks.inc:73
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr ""
-"FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
+msgstr "FusionDirectory requiere este modulo para poder hablar con su servidor LDAP."
 
 #: setup/class_setupStep_Checks.inc:81
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr ""
-"FusionDirectory requiere este modulo para una interfaz internacionalizada."
+msgstr "FusionDirectory requiere este modulo para una interfaz internacionalizada."
 
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr ""
-"FusionDirectory requiere este modulo para comunicarse con distintos tipos de "
-"servidores y protocolos."
+msgstr "FusionDirectory requiere este modulo para comunicarse con distintos tipos de servidores y protocolos."
 
 #: setup/class_setupStep_Checks.inc:97
 msgid "FusionDirectory requires this module for the samba integration."
@@ -605,14 +569,11 @@ msgstr "FusionDirectory requiere este modulo para la integración con Samba"
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr ""
-"FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar "
-"encripción SSHA"
+msgstr "FusionDirectory requiere ya sea el modulo 'mhash' o 'sha1' para usar encripción SSHA"
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr ""
-"FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
+msgstr "FusionDirectory requiere este modulo para poder hablar con un servidor IMAP."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "mbstring"
@@ -630,9 +591,7 @@ msgstr "MDB2"
 msgid ""
 "FusionDirectory requires this module to communicate with several supported "
 "databases."
-msgstr ""
-"FusionDirectory requiere este modulo para comunicarse con varias bases de "
-"datos soportadas."
+msgstr "FusionDirectory requiere este modulo para comunicarse con varias bases de datos soportadas."
 
 #: setup/class_setupStep_Checks.inc:134
 msgid ""
@@ -661,10 +620,7 @@ msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"registr_globals es un mecanismo de PHP para registrar todas las variables "
-"globales de tal manera que sean accesible desde scripts sin que cambien su "
-"ámbito. Esto puede ser un problema de seguridad."
+msgstr "registr_globals es un mecanismo de PHP para registrar todas las variables globales de tal manera que sean accesible desde scripts sin que cambien su ámbito. Esto puede ser un problema de seguridad."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
@@ -672,24 +628,19 @@ msgstr "Busque 'register_globals' en su php.ini y modifíquelo por 'Off'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
-"PHP usa este valor en el recolector de basura para eliminar las sesiones "
-"antiguas."
+msgstr "PHP usa este valor en el recolector de basura para eliminar las sesiones antiguas."
 
 #: setup/class_setupStep_Checks.inc:176
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Ajustando este valor a un día impedirá la perdida de sesiones y cookies "
-"antes de que realmente se desconecte por tiempo."
+msgstr "Ajustando este valor a un día impedirá la perdida de sesiones y cookies antes de que realmente se desconecte por tiempo."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
+msgstr "Busque 'sessio.gc_maxlifetime' en su php.ini y modifíquelo a 86400 o mayor."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -700,7 +651,7 @@ msgstr "Off"
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr ""
+msgstr "Para poder usar FusionDirectory sin problemas, la opción session.auto_start debe estar configurada en 'Off' en su php.ini."
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
@@ -721,9 +672,7 @@ msgstr ""
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Esta opción está relacionada con el manejo de salida de PHP. Desactive esta "
-"opción poniéndola en off para mejorar el rendimiento."
+msgstr "Esta opción está relacionada con el manejo de salida de PHP. Desactive esta opción poniéndola en off para mejorar el rendimiento."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
@@ -735,18 +684,15 @@ msgstr "El tiempo de ejecución debe ser de al menos 30 segundos."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Busque 'max_execution_time' en su php.ini y modifíquelo a '30' o mayor."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Aumente la seguridad del servidor modificando el parámetro 'expose_php' a "
-"'off'. PHP no debería enviar ningún tipo de información sobre el servidor "
-"que esta ejecutando la aplicación."
+msgstr "Aumente la seguridad del servidor modificando el parámetro 'expose_php' a 'off'. PHP no debería enviar ningún tipo de información sobre el servidor que esta ejecutando la aplicación."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
@@ -754,14 +700,13 @@ msgstr "Busque 'expose_php' en su php.ini y modifíquelo a 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
+msgstr "Aumente el rendimiento de su servidor modificando 'magic_quotes_gpc' a 'off'"
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Busque 'zend.ze1_compatibility_mode' en su php.ini y modifíquelo a 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -776,10 +721,7 @@ msgstr "No se puede escribir en la configuración"
 msgid ""
 "FusionDirectory reads its configuration from a file located in (%s/%s). The "
 "setup can write the configuration directly if it is writeable."
-msgstr ""
-"FusionDirectory lee su configuración desde un archivo localizado en (%s/%s). "
-"El proceso de instalación puede escribir la configuración directamente si el "
-"mismo es enscribible."
+msgstr "FusionDirectory lee su configuración desde un archivo localizado en (%s/%s). El proceso de instalación puede escribir la configuración directamente si el mismo es enscribible."
 
 #: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
 msgid "FusionDirectory settings 2/3"
@@ -801,9 +743,7 @@ msgstr "Conectividad LDAP"
 msgid ""
 "This dialog performs the basic configuration of the LDAP connectivity for "
 "FusionDirectory."
-msgstr ""
-"Este dialogo realiza la configuración básica de la conectividad LDAP para "
-"FusionDirectory"
+msgstr "Este dialogo realiza la configuración básica de la conectividad LDAP para FusionDirectory"
 
 #: setup/class_setupStep_Ldap.inc:117
 #, php-format
@@ -846,9 +786,7 @@ msgstr "Terminar - Escribir el archivo de configuración"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"El fichero de configuración es universalmente legible. ¡Por favor modifique "
-"los permisos del archivo!"
+msgstr "El fichero de configuración es universalmente legible. ¡Por favor modifique los permisos del archivo!"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -860,16 +798,13 @@ msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
-msgstr ""
-"Después de descargar y colocar el archivo en %s, por favor asegúrese de que "
-"el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, "
-"mientras que otros usuarios no deben poder."
+msgstr "Después de descargar y colocar el archivo en %s, por favor asegúrese de que el usuario bajo el cual está corriendo el servidor web es capaz de leer %s, mientras que otros usuarios no deben poder."
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Completado"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Siguiente"
 
@@ -909,69 +844,60 @@ msgstr "El Uid base debe ser un valor numérico"
 
 #: setup/class_setupStep_Config1.inc:137
 msgid "The given password minimum length is not numeric."
-msgstr ""
-"El valor indicado como longitud mínima de la contraseña no es un valor "
-"numérico."
+msgstr "El valor indicado como longitud mínima de la contraseña no es un valor numérico."
 
 #: setup/class_setupStep_Config1.inc:140
 msgid "The given password differ value is not numeric."
-msgstr ""
-"El valor indicado como diferencias mínimas de la contraseña no es un valor "
-"numérico."
+msgstr "El valor indicado como diferencias mínimas de la contraseña no es un valor numérico."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
-msgstr "Metodo de contraseña"
+msgstr "Método de contraseña"
 
 #: html/class_passwordRecovery.inc:127
 msgid "Error: Password method not available!"
 msgstr "Error: ¡El método de contraseñas no esta disponible!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "La configuración de FusionDirectory %s/%s no se puede leer. Cancelado."
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
-msgstr "Error de configuración"
+msgstr "Error en la configuración"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir "
-"nueva contraseña'."
+msgstr "No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir nueva contraseña'."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -979,68 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La clave contiene caracteres unicode posiblemente problemáticos!"
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "La sesión no será codificada."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr "No se encontró la cuenta %s"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr "Se encontraron varias cuentas %s"
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr "Dirección de correo"
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr "No existe una cuenta con el correo %s"
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr "Existen varias cuentas con el correo %s"
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-"Contacte a su administrador, hubo un problema con el servidor de correo"
+msgstr "Contacte a su administrador, hubo un problema con el servidor de correo"
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr "Esta prenda es invalida"
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1051,152 +976,133 @@ msgstr "Smarty"
 #: html/main.php:136
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr ""
-"No se puede encontrar el archivo '%s' - por favor ejecute '%s' para "
-"solucionarlo"
+msgstr "No se puede encontrar el archivo '%s' - por favor ejecute '%s' para solucionarlo"
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Configuración PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr ""
-"Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso "
-"hasta que esto sea solucionado por un administrador."
+msgstr "Error Fatal: 'Register globals' está activado. No se permitirá ningun acceso hasta que esto sea solucionado por un administrador."
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
-msgstr ""
-"Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
+msgstr "Su contraseña va a caducar próximamente, ¡Por favor cambie su contraseña!"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "¡Funcionando sin memoria!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Desactivados chequeos de ACL de usuario"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Extensión"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Error de configuración"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"Error fatal: no todas las variables POST fueron transferidas por PHP - por "
-"favor informe a su administrador!"
+msgstr "Error fatal: no todas las variables POST fueron transferidas por PHP - por favor informe a su administrador!"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "¡La sesión no es codificada!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por "
-"el valor de ini de php."
+msgstr "El tiempo de vida de sesión es su fusiondirectory.conf sera sustituido por el valor de ini de php."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Error Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "¡Hay un problema con la configuración de autenticación!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"¡No se puede encontrar un usuario válido para la configuración de "
-"autenticación seleccionada!"
+msgstr "¡No se puede encontrar un usuario válido para la configuración de autenticación seleccionada!"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
-msgstr ""
-"La información de usuario no es única entre todos los arboles LDAP "
-"configurados"
+msgstr "La información de usuario no es única entre todos los arboles LDAP configurados"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
-msgstr ""
-"¡No se puede acceder a la información sobre los esuqemas LDAP instalados!"
+msgstr "¡No se puede acceder a la información sobre los esuqemas LDAP instalados!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Su configuración LDAP tiene definiciones de esquemas antiguos:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "¡Por favor introduzca un nombre de usuario válido!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Error de Autenticación"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr ""
-"¡No se puede recuperar la información de usuario para autenticación htaccess!"
+msgstr "¡No se puede recuperar la información de usuario para autenticación htaccess!"
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
-msgstr ""
-"Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
+msgstr "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y "
-"recargue esta página antes de iniciar sesión!"
+msgstr "Su navegador tiene las cookies desactivadas. ¡Porfavor active las cookies y recargue esta página antes de iniciar sesión!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Información"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1207,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Seguridad"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1236,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Modificar información"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Inicio"
@@ -1264,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1276,13 +1178,12 @@ msgid "Password"
 msgstr "Contraseña"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Error de contraseña"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Nombre de equipo"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -1290,21 +1191,28 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Puerto"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Extensión"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Información personal"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1312,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Genérico"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1362,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Teléfono"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Servidor"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Cliente ligero"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Grupo de objetos"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1455,469 +1360,461 @@ msgstr "Configuración"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Añadidos"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Idioma"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Tema"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Zona de uso horario"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Parámetros de Contraseña"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Longitud mínima de la contraseña"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Usar caducidad de cuenta"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "Activar filtro de grupo primario"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Mostrar resumen en listados"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Delegar en unidades administrativas"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Activar Copiar y Pegar"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Atributo de inicio de sesión"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Recordad los parámetros de filtro de los diálogos"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Instantaneas / Deshacer"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Activar instantaneas"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Base de instantaneas"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Métodos"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr "Almacén de grupos y usuarios"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Incluir el título personal en el DN de usuario"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr "CN Modificado"
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "UIDs Automaticas"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Depurando"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1939,274 +1836,57 @@ msgstr "No se ha asignado ningún valor al campo 'Nueva contraseña'."
 
 #: plugins/personal/password/class_password.inc:117
 msgid "The password used as new and current are too similar."
-msgstr ""
-"La contraseña actual y la introducida como nueva son demasiado parecidas."
+msgstr "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
 #: plugins/personal/password/class_password.inc:119
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
-msgstr ""
-"Check-hook ha reportado un problema: %s. Cambio de contraseña cancelado!"
+msgstr "Check-hook ha reportado un problema: %s. Cambio de contraseña cancelado!"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "La contraseña introducida como contraseña actual no es correcta."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Cambiar contraseña de usuario"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr "¡Por favor añada una IP única o una combinación red/mascara!"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "mujer"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "hombre"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "¡No se puede subir el archivo!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr "El método de contraseña seleccionado no está disponible."
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
-"No se puede guardar la foto del usuario, FusionDirectory requiere que este "
-"instalado el paquete 'php5-imagick'"
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr "No se puede construir RDN: ¡no se permite + para construir subRDN!"
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "No se puede construir RDN: ¡Atributo no definido!"
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr "No se puede construir RDN: ¡Valor no válido del atributo!"
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
-"¡El método de contraseña seleccionado necesita una configuració inicial!"
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Nombre"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Nombre de pila"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Página Web"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Móvil"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Fecha de nacimiento"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Unidad"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Tipo de Vía"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Profesión"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Última dirección conocida"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Lugar de residencia"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Descripción de la unidad"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Área de desarrollo"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Función"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Visible por todos"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Calle"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Rol"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Código Postal"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2217,122 +1897,76 @@ msgstr "Parámetros genéricos del usuario"
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Información personal"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Identificación de Usuario"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Titulación académica"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Fecha de nacimiento"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Idioma preferido"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Foto del usuario"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Restricciones de entrada"
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organización"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Número del departamento"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2344,66 +1978,52 @@ msgstr "Número del departamento"
 msgid "Description"
 msgstr "Descripción"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
-msgstr "Gestor"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Número de empleado"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Categoría profesional"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Número de habitación"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Número de teléfono"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Número del busca"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Teléfono móvil"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Número de Fax"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Provincia"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2411,306 +2031,439 @@ msgstr "Provincia"
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:1409
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Provincia"
+
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Dirección"
+
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Número sala"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Número de habitación"
+
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Móvil"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Buscapersonas"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Información corporativa"
+
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organización"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Número departamento"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Número del departamento"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Número empleado"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Número de empleado"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Categoría profesional"
+
+#: plugins/personal/generic/class_user.inc:292
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Código Postal"
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr "Gestor"
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Teléfono privado"
+
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Metodo de contraseña de usuario"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Las entradas difieren"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "Editar características posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Editar características de correo electrónico"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Editar características samba"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Editar características telefónicas"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "Menú"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Editar propiedades iniciales del menú"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Entorno"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Editar características de entorno"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Nombre"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Grupo primario"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Estado"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Pertenencia a grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Cuenta"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "El usuario debe introducir la contraseña en el primer inicio de sesión"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Sistema de seguridad"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Modo seguro"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Editar parametros de usuarios POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "Sin configurar"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "Periodo de gracia activado"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "activo"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "la contraseña expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Grupo de usuarios"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2807,14 +2560,7 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr ""
-"Saludos,\n"
-"Aquí están los datos solicitados:\n"
-"\n"
-"- Usuario: %s\n"
-"- Enlace: %s\n"
-"\n"
-"El enlace solo es valido por 10 minutos."
+msgstr "Saludos,\nAquí están los datos solicitados:\n\n- Usuario: %s\n- Enlace: %s\n\nEl enlace solo es valido por 10 minutos."
 
 #: plugins/admin/password/class_recoveryConfig.inc:111
 msgid "Second email"
@@ -2836,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2847,128 +2593,107 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr ""
-"Saludos,\n"
-"\n"
-"Su clave ha sido cambiada.\n"
-"Su nombre de usuario aun es %s."
+msgstr "Saludos,\n\nSu clave ha sido cambiada.\nSu nombre de usuario aun es %s."
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Nombre de la Organización"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Categoría"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Número de teléfono"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Base"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Parámetros administrativos"
+msgid "Postal address"
+msgstr "Código Postal"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Número de teléfono"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "Componentes del dominio"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
-"administrativa!"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Etiquetando '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Continuar"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Moviendo '%s' a '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Objeto"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Ha fallado a copiar %s, operación abortada"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Continuar"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Nombre de departamento"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Dirección"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "El objeto '%s' está ya marcado"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Añadir marca (%s) al objeto '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Eliminando marca del objeto '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Dominio"
 
@@ -2985,8 +2710,8 @@ msgstr "Componente del dominio"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "País"
 
@@ -2994,8 +2719,8 @@ msgstr "País"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Localidad"
 
@@ -3003,24 +2728,26 @@ msgstr "Localidad"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Acciones"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Editar"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Nombre del País"
@@ -3038,11 +2765,24 @@ msgid "List of users"
 msgstr "Lista de usuarios"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Plantilla"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Apellido"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Nombre de pila"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3054,7 +2794,7 @@ msgstr "Plantilla"
 msgid "Properties"
 msgstr "Propiedades"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Cambiar contraseña"
@@ -3075,15 +2815,15 @@ msgstr "Aplicar plantilla"
 msgid "New user from template"
 msgstr "Nuevo usuario desde plantilla"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "Eliminar usuario"
 
@@ -3091,58 +2831,56 @@ msgstr "Eliminar usuario"
 msgid "Manage users"
 msgstr "Gestión de usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
-msgstr "Permiso"
+msgstr "Permisos"
 
 #: plugins/admin/users/class_userManagement.inc:391
 msgid "You have no permission to change this users password!"
 msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
-msgstr "Error de Permisos"
+msgstr "Error de permisos"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido "
-"bloqueada!"
+msgstr "El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido bloqueada!"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3150,56 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"¡Añadir UID '%s' al grupo '%s ha fallado: no podemos encontrar el objeto "
-"usuario!"
+msgstr "¡Añadir UID '%s' al grupo '%s ha fallado: no podemos encontrar el objeto usuario!"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr "¡Añadir UID '%s' al grupo '%s ha fallado: UID es usado mas de una vez!"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "¡UID desconocido!"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s "
-"entradas!"
+msgstr "La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s entradas!"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "¡No se puede encontrar nigún SID para '%s'!"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "¡No se puede encontrar un RIDBASE para '%s'."
@@ -3213,23 +2947,23 @@ msgstr "¡El gidNumber '%s' introducido ya esta siendo usado por %s!"
 msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Tipo de grupo de samba"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Miembros de grupo de salto telefónico"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Grupo Nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Miembro del grupo"
 
@@ -3257,119 +2991,159 @@ msgstr "Eliminar grupo"
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "Editar características posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Editar características de correo electrónico"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Editar características samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Editar características telefónicas"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "Menú"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Editar propiedades iniciales del menú"
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Entorno"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Editar características de entorno"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Eliminar usuario"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Roles de control de acceso"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "Editar roles CA"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Todas las categorías"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Eliminar ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Un nivel"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Objeto actual"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Subárbol completo"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Subárbol completo (permanente)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Arriba"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Abajo"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "No hay ACL configuradas en esta categoría"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "Eliminar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Todos los objetos en el subárbol actual"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Objeto en uso"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Este Rol no puede ser eliminado por estar siendo usado por los siguientes "
-"objetos:"
+msgstr "Este Rol no puede ser eliminado por estar siendo usado por los siguientes objetos:"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Rol"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Roles de control de acceso"
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -3377,7 +3151,7 @@ msgstr "Permisos"
 msgid "List of acls"
 msgstr "Lista de acls"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "ACL"
@@ -3395,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "Plantillas ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
@@ -3415,59 +3189,68 @@ msgstr "Plantillas"
 msgid "Windows Install"
 msgstr "Instalación Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Cola telefónica"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Aplicaciones"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Inicio"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Sumario FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr "Cliente Argonaut"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Cola telefónica"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Aplicaciones"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Estos sistemas ya han sido configurados por otros grupos de objetos y no "
-"pueden ser añadidos:"
+msgstr "Estos sistemas ya han sido configurados por otros grupos de objetos y no pueden ser añadidos:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3477,9 +3260,7 @@ msgstr "Información"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"¡No puede combinar terminales y estaciones de trabajo en un unico grupo de "
-"objetos!"
+msgstr "¡No puede combinar terminales y estaciones de trabajo en un unico grupo de objetos!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3493,7 +3274,7 @@ msgstr "¡Solo se puede combiar dos tipos de objetos diferentes como máximo!"
 msgid "Object group generic"
 msgstr "Grupo de objetos genérico"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Miembro"
 
@@ -3522,40 +3303,34 @@ msgstr "Eliminar grupo de objetos"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"No hay definiciones de extensión para iniciar '%s', por favor compruebe su "
-"archivo de configuración."
+msgstr "No hay definiciones de extensión para iniciar '%s', por favor compruebe su archivo de configuración."
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "El proceso de eliminación ha sido cancelado por la extensión '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "Lista ordenada"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Eliminar esta entrada"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "en"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "En linea"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "Error XML"
 
@@ -3599,46 +3374,44 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"¡La generación de esta página ha provocado errores en el interprete PHP!"
+msgstr "¡La generación de esta página ha provocado errores en el interprete PHP!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr "Enviar informe de errores al equipo de FusionDirectory"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Enviar informe de errores"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Modificar información"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "error interno"
 
 #: include/class_session.inc:100 include/class_session.inc:137
 #: include/class_session.inc:175
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
+msgstr "¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Mostrar roles"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
@@ -3646,103 +3419,135 @@ msgstr "No tiene permisos para crear una instantanea para %s."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Grupo de usuarios"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "Ninguno"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "¡'%s' debe ser menor que %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "¡'%s' debe ser menor que %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "¡No se puede subir el archivo!"
+msgstr "No puedo leer el archivo: %s"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "¡El certificado esta vacío!"
+msgstr "el archivo está vacío"
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "archivo no encontrado"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "archivo no accesible"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Recargar"
+msgstr "Enviar"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Abajo"
+msgstr "Descargar"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'"
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nombre de objeto"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3762,9 +3567,9 @@ msgstr "Seleccione para mostrar objetos que tengan '%s' activado"
 
 #: include/class_msgPool.inc:49 plugins/admin/ogroups/ogroup_objects.tpl.c:8
 msgid "Select to search within subtrees"
-msgstr "Seleccione para buscar dentro de subárboles"
+msgstr "Seleccione para buscar dentro de los subárboles"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
@@ -3900,114 +3705,113 @@ msgstr "¡El campo '%s' tiene una palabra reservada!"
 #: include/class_msgPool.inc:292
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr ""
-"¡El comando especificado como método %s para la extensión '%s' no existe!"
+msgstr "¡El comando especificado como método %s para la extensión '%s' no existe!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "¡El comando '%s' no es válido!"
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "¡'%s' comando (%s) para la extensión %s no es válido!"
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "¡'%s' comando para la extensión %s no es válido!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "¡'%s' comando (%s) no es válido!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
+#, php-format
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "¡'%s' comando (%s) para la extensión %s no es válido!"
+
+#: include/class_msgPool.inc:334
 #, php-format
 msgid "Cannot execute '%s' command!"
 msgstr "¡No se puede ejecutar el comando '%s'!"
 
-#: include/class_msgPool.inc:331
-#, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "¡No se puede ejecutar el comando '%s' (%s) para la extensión %s!"
-
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "¡No se puede ejecutar el comando '%s' para la extensión %s!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "¡No se puede ejecutar el comando '%s' (%s)!"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "¡No se puede ejecutar el comando '%s' (%s) para la extensión %s!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "¡El valor especificado como '%s' es demasiado grande!"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "¡'%s' debe ser menor que %s!"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "¡El valor especificado como '%s' es demasiado pequeño!"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "¡'%s' debe ser %d o superior!"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "¡'%s' depende de '%s' - Por favor introduzca ambos valores!"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "¡Ya existe una entrada con el atributo '%s' en el sistema!"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "¡El campo obligatorio '%s' está vacio!"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Ejemplo"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "El campo '%s' tiene caracteres no validos."
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' no está permitido:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "¡'%s' no están permitidos!"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "¡El campo '%s' tiene caracteres no validos!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4020,11 +3824,10 @@ msgstr "¡Extensión PHP %s no encontrada!"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4032,313 +3835,300 @@ msgstr "Cancelar"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Guardar"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Añadir %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Activar"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Activar %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editar..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Editar %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Atrás"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "¡Esta cuenta tiene extensiones %s no validas!"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Esta cuenta tiene características %s activadas. Puede desactivarla pulsando "
-"aquí"
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Esta cuenta tiene características %s activadas. Puede desactivarla pulsando aquí"
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, "
-"necesita eliminar las caracteristicas %s primero!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Esta cuenta tiene las características %s activadas. ¡Para desactivarlas, necesita eliminar las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Esta cuenta tiene características %s desactivadas. Puede activarla pulsando "
-"aquí"
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Esta cuenta tiene características %s desactivadas. Puede activarla pulsando aquí"
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, "
-"necesita añadir las caracteristicas %s primero!"
+msgstr "Esta cuenta tiene las características %s desactivadas. ¡Para activarlas, necesita añadir las caracteristicas %s primero!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "Añadir caracteristicas %s"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "Eliminar las caracteristicas %s"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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"
+msgstr "Pulse en el botón - Editar - para cambiar la información en esta ventana"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Enero"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Febrero"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Mayo"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Junio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Julio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Septiembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Octubre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Noviembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Diciembre"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Lunes"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Martes"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Jueves"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Viernes"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr "Operación de base de datos fallida!"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "lectura"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "adición"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "modificación"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "eliminación"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "busqueda"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "autenticación"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "¡LDAP %s ha fallado!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "¡La consulta LDAP ha fallado!"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "¡Ha fallado el subir archivo!"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Ha fallado el subir archivo: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "¡Ha fallado la comunciación con el servicio de infraestructura!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Ha fallado la comunciación con el servicio de infraestructura: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' esta todavía en uso por el objeto: %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' esta todavía en uso."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' esta todavía en uso por los objetos: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "¡El archivo %s no existe!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "¡No se puede abrir el archivo '%s'!"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "¡No se puede grabar el archivo '%s'!"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe "
-"el archivo de configuración!"
+msgstr "El valor para '%s' no esta configurado o no es válido.¡Por favor compruebe el archivo de configuración!"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "¡No se puede eliminar el fichero '%s'!"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "¡No se puede eliminar la carpeta '%s'!"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Comprobando soporte %s"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Instala y activa el módulo de PHP %s."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
-msgstr ""
+msgstr "Instale y active el module Pear %s. "
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr ""
-"No se puede inicializar la clase '%s'! Posiblemente hay un complemento "
-"faltante en su instalación de FusionDirectory?"
+msgstr "No se puede inicializar la clase '%s'! Posiblemente hay un complemento faltante en su instalación de FusionDirectory?"
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr "¡La base introducida no es válida, se ha dejado el valor anterior!"
@@ -4359,111 +4149,105 @@ msgstr "No se puede exportar a PDF: no se ha instalado la librería FPDF."
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No "
-"se puede crear la instancia del plugin!"
+msgstr "No hay declaración de pestaña para '%s' en su archivo de configuración. ¡No se puede crear la instancia del plugin!"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "¡El certificado esta vacío!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
-msgstr ""
-"¡No se puede cargar el certificado - solo se soportan certificados PEM/DER!"
+msgstr "¡No se puede cargar el certificado - solo se soportan certificados PEM/DER!"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr "¡No se puede extraer información de certificados que no sean PEM!"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "¡No ha cargado un certificado válido!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Cancelar todo"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Error XML en fusiondirectory.conf: %s en la línea %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"No se puede conectar a LDAP: Por favor consulte con el administrador de "
-"sistemas."
+msgstr "No se puede conectar a LDAP: Por favor consulte con el administrador de sistemas."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "¡sambaSID y/o sambaRidBase no aparece en la configuración!"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
-"está activo."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no está activo."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"La funcionalidad de instancias esta activa, pero no se encuentra el módulo "
-"de compresión requerido. Por favor instale '%s'."
+msgstr "La funcionalidad de instancias esta activa, pero no se encuentra el módulo de compresión requerido. Por favor instale '%s'."
+
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Todas las categorías"
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Enviar"
 
@@ -4474,206 +4258,201 @@ msgstr "SASL"
 #: include/password-methods/class_password-methods-sasl.inc:63
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
-msgstr ""
+msgstr "No se puede cambiar la clave, usuario '%s' desconocido"
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"¡No se puede encontrar un método de codificación válido para la clave "
-"introducida!"
+msgstr "¡No se puede encontrar un método de codificación válido para la clave introducida!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
-msgstr ""
-"El objeto ha cambiado desde que fue abierto en FusionDirectory. Todos los "
-"cambios que pudiera haber sido hechos por otros se perderán si guarda esta "
-"entrada!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr "El objeto ha cambiado desde que fue abierto en FusionDirectory. Todos los cambios que pudiera haber sido hechos por otros se perderán si guarda esta entrada!"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "Modificando ACL dn"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "desde"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "Todos los usuarios"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Eliminar ACLs"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Utilizar las ACL definidas en el rol"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "¡No hay ACL configuradas para esta categoría!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Tiene ACLs para estos objetos: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "Categoría ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Mostrar/ocultar caracteristicas avanzadas"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Crear objetos"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Eliminar Objetos"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Garantizar permiso al propietario"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "leer"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "escribir"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "Objeto completo"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "¡Tipo de ACL desconocido '%s'!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "¡Entrada desconocida '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Rol: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "rol desconocido"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Tiene configuraciones de los siguientes objetos: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Miembros"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "inactivo"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "Sin miembros"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Gestión de las Listas de control de acceso"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "Roles ACL"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Ir al departamento de usuarios"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
@@ -4696,327 +4475,288 @@ msgstr "¡Se ha indicado un objectType vacio o no válido!"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"El parámetro de zona horaria '%s' en fusiondirectory.conf no es válido. No "
-"se puede calcular una compensación correcta para la zona horaria."
+msgstr "El parámetro de zona horaria '%s' en fusiondirectory.conf no es válido. No se puede calcular una compensación correcta para la zona horaria."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"No se pueden crear automáticamente subárboles con RDN '%s': ¡No se ha "
-"encontrado la clase del objeto!"
+msgstr "No se pueden crear automáticamente subárboles con RDN '%s': ¡No se ha encontrado la clase del objeto!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr ""
-"No se pueden crear automáticamente subárboles con RDN '%s': no soportado"
+msgstr "No se pueden crear automáticamente subárboles con RDN '%s': no soportado"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "Falta el programa de la línea de comandos «%s»!"
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' "
-"en la linea %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' en la linea %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Ha habido un error importando dn: '%s', ¡Por favor compruebe su LDIF desde "
-"la línea %s en adelante!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Ha habido un error importando dn: '%s', ¡Por favor compruebe su LDIF desde la línea %s en adelante!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Por favor solucione el problema y actualize la página."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Todos los objetos en esta categoría"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
-msgstr ""
-"¡El formato de la configuración ha cambiado. Por favor use el asistente de "
-"configuración!"
+msgstr "¡El formato de la configuración ha cambiado. Por favor use el asistente de configuración!"
 
 #: include/class_databaseManagement.inc:80
 msgid "Please activate debugging for details!"
 msgstr "¡Por favor active depuración para mas información!"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Va a eliminar la instantanea '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Eliminar instantanea"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Error fatal: no se han definido un emplazamiento para las clases - por favor "
-"ejecute '%s' para solucionar esto"
+msgstr "Error fatal: no se han definido un emplazamiento para las clases - por favor ejecute '%s' para solucionar esto"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
-"ejecutando '%s'"
+msgstr "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo ejecutando '%s'"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
+msgstr "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "¡El nombre de usuario / UID no es único dentro del árbol LDAP!"
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
-"contacte con su Administrador."
+msgstr "El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor contacte con su Administrador."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
-msgstr ""
-"Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
-"desarrolladores!"
+msgstr "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los desarrolladores!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte "
-"con su Administrador!"
+msgstr "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte con su Administrador!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
-"Esto no debería ocurrir - limpiando referencias multiples."
+msgstr "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
-"si se supera el límite máximo"
+msgstr "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje si se supera el límite máximo"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Entradas por página"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr "No se puede leer el archivo de revisión!"
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "No esta disponible 'baseIdHook'.¡Se usara la base predeterminada!"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"No puedo obtener información de esquemas del servidor. ¡No es posible "
-"comprobar los esquemas!"
+msgstr "No puedo obtener información de esquemas del servidor. ¡No es posible comprobar los esquemas!"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Usado para guardar información específica de la cuenta."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Usado para bloquear entradas editadas actualmente y así evitar múltiples "
-"cambios simultáneos."
+msgstr "Usado para bloquear entradas editadas actualmente y así evitar múltiples cambios simultáneos."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
-msgstr ""
-"¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
+msgstr "¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Ha activado la opción rfc2307bis en el paso 'configuración ldap', pero su "
-"configuración de esquemas no soporta esta opción."
+msgstr "Ha activado la opción rfc2307bis en el paso 'configuración ldap', pero su configuración de esquemas no soporta esta opción."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
-"debe ser AUXILIARY"
+msgstr "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' debe ser AUXILIARY"
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Su esquema está configurado para soportar grupos rfc2307bis, pero ha "
-"desactivado esta opción en el paso 'configuración ldap'."
+msgstr "Su esquema está configurado para soportar grupos rfc2307bis, pero ha desactivado esta opción en el paso 'configuración ldap'."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
-"existir."
+msgstr "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece existir."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "No se puede asignar un identificador (ID) libre:"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "¡método de asignación de id desconocido!"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "¡sambaUnixIdPool no es único!"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "¡No hay ID disponibles!"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "¡Excedido el número de intentos máximo!"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
@@ -5029,10 +4769,7 @@ msgid ""
 "The last interaction with the FusionDirectory web interface has been some "
 "time ago in the past. For security reasons, the session has been closed. To "
 "continue with administrative tasks, please sign in again."
-msgstr ""
-"La ultima interacción con la interfaz web de FusionDirectory ocurrió hace "
-"algún tiempo. Por razones de seguridad la sesión ha sido cerrada. Para "
-"continuar con las tareas administrativas, por favor entre nuevamente."
+msgstr "La ultima interacción con la interfaz web de FusionDirectory ocurrió hace algún tiempo. Por razones de seguridad la sesión ha sido cerrada. Para continuar con las tareas administrativas, por favor entre nuevamente."
 
 #: ihtml/themes/default/logout.tpl.c:8
 msgid "Sign in again"
@@ -5046,9 +4783,7 @@ msgstr "Pantalla de inicio"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Por favor use su nombre de usuario y contraseña para iniciar sesión en el "
-"sistema de administración."
+msgstr "Por favor use su nombre de usuario y contraseña para iniciar sesión en el sistema de administración."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5059,7 +4794,7 @@ msgstr "Nombre de Usuario"
 
 #: ihtml/themes/default/login.tpl.c:26
 msgid "I forgot my password"
-msgstr ""
+msgstr "Olvidé mi clave"
 
 #: ihtml/themes/default/login.tpl.c:29 ihtml/themes/default/login.tpl.c:32
 #: ihtml/themes/default/login.tpl.c:35 ihtml/themes/default/recovery.tpl.c:32
@@ -5081,7 +4816,6 @@ msgstr "Pulse aquí para iniciar sesión"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5091,6 +4825,7 @@ msgstr "Pulse aquí para iniciar sesión"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
 
@@ -5102,21 +4837,15 @@ msgstr "Detectado conflicto de sesiones."
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Probablemente exista otra instancia activa de sus sesión. Operaciones en "
-"ventanas múltiples no son técnicamente posibles y dependen  del navegador "
-"utilizado. El uso de diferentes navegadores a la vez (por ejemplo: IE y "
-"Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Probablemente exista otra instancia activa de sus sesión. Operaciones en ventanas múltiples no son técnicamente posibles y dependen  del navegador utilizado. El uso de diferentes navegadores a la vez (por ejemplo: IE y Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Ignorando este mensaje cambiara/eliminara los datos que esta actualmente "
-"editando. Por favor, cierre las otras ventanas y vuelva a entrar."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Ignorando este mensaje cambiara/eliminara los datos que esta actualmente editando. Por favor, cierre las otras ventanas y vuelva a entrar."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5136,8 +4865,7 @@ msgstr "Métodos disponibles"
 
 #: ihtml/themes/default/recovery.tpl.c:17
 msgid "Receive by email a link that allows you to reset your password"
-msgstr ""
-"Recibir por correo electrónico una dirección que permite cambiar la clave"
+msgstr "Recibir por correo electrónico una dirección que permite cambiar la clave"
 
 #: ihtml/themes/default/recovery.tpl.c:20
 msgid "Send"
@@ -5149,19 +4877,15 @@ msgstr "Seleccione aquí para enviar una dirección de cambio de clave "
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
-msgstr ""
-"Si ninguno de los métodos anteriores le funciona, contacte a su "
-"administrador para cambiar su clave"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr "Si ninguno de los métodos anteriores le funciona, contacte a su administrador para cambiar su clave"
 
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Este dialogo provee un método sencillo para cambiar su clave. Introduzca la "
-"clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
+msgstr "Este dialogo provee un método sencillo para cambiar su clave. Introduzca la clave nueva (dos veces) en los campos debajo y presione el botón 'Cambiar'."
 
 #: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
@@ -5173,11 +4897,11 @@ msgstr "Repita la nueva contraseña"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
-msgstr "Seguridad de contraseña"
+msgstr "Resistencia de la contraseña"
 
 #: ihtml/themes/default/recovery.tpl.c:56
 #: ihtml/themes/default/recovery.tpl.c:89
@@ -5207,22 +4931,18 @@ msgstr "Su contraseña se ha cambiado correctamente."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr ""
-"Introduzca su dirección de correo actual en el campo debajo y presione el "
-"botón 'Cambiar'"
+msgstr "Introduzca su dirección de correo actual en el campo debajo y presione el botón 'Cambiar'"
 
 #: ihtml/themes/default/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr ""
-"=> Utilice el formato largo de su correo, ej: Pedro Pérez => pedro."
-"perez@dominio.com"
+msgstr "=> Utilice el formato largo de su correo, ej: Pedro Pérez => pedro.perez@dominio.com"
 
 #: ihtml/themes/default/recovery.tpl.c:95
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr ""
+msgstr "La recuperación de claves no está activada. Si ha perdido su clave por favor contacte a su administrador."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:2
 msgid "Restoring object snapshots"
@@ -5232,22 +4952,20 @@ msgstr "Recuperar instantanea de objetos"
 msgid ""
 "This procedure will restore a snapshot of the selected object. It will "
 "replace the existing object after pressing the folder icon."
-msgstr ""
+msgstr "Este procedimiento restaurará una instantánea del objeto seleccionado. Reemplazará el objeto existente después de oprimir el icono de la carpeta."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:8
 msgid ""
 "Remember that DNS configuration and database entries could not be restored. "
 "For some objects it is only necessary to open and save them again (goFon), "
 "but some entries must be recreated manually."
-msgstr ""
+msgstr "Recuerde que la configuración de DNS y entradas de la base de datos no pudieron ser restauradas. Para algunos objetos (goFon) solo es necesario abrirlos y guardarlos nuevamente, pero algunas entradas deben ser creadas manualmente."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:11
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"No olvide comprobar referencias a otros objetos, por ejemplo ¿todavía "
-"existen las impresoras seleccionadas?"
+msgstr "No olvide comprobar referencias a otros objetos, por ejemplo ¿todavía existen las impresoras seleccionadas?"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5255,9 +4973,7 @@ msgstr "No hay instantaneas disponibles que puedan ser recuperadas"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Elija una instantanea y pulse en la imagen carpeta, para recuperar la "
-"instantanea"
+msgstr "Elija una instantanea y pulse en la imagen carpeta, para recuperar la instantanea"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5268,18 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Este procedimiento creará una instantánea de los objetos seleccionados. "
-"Serán guardados dentro de una carpeta especial de sus sistema de archivos y "
-"podrán recuperados posteriormente."
+msgstr "Este procedimiento creará una instantánea de los objetos seleccionados. Serán guardados dentro de una carpeta especial de sus sistema de archivos y podrán recuperados posteriormente."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Recuerde que las entradas de base de datos, configuración DNS y zonas "
-"creadas en extensiones de servidor no serán guardadas en la instantánea."
+msgstr "Recuerde que las entradas de base de datos, configuración DNS y zonas creadas en extensiones de servidor no serán guardadas en la instantánea."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5294,18 +5005,14 @@ msgstr "Razón para generar esta instantánea"
 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."
+msgstr "Por favor verifique que realmente desea hacer esto ya que FusionDirectory no tiene forma de recuperar la data"
 
 #: ihtml/themes/default/simple-remove.tpl.c:8
 #: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+msgstr "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para Abortar."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5316,10 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
-"mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, "
-"pulsando en el botón <i>Eliminar</i>."
+msgstr "Si esta detección de bloqueo es falsa, la otra persona cerro su navegador mientras estaba editando. Puede eliminar el archivo de bloqueo en ese caso, pulsando en el botón <i>Eliminar</i>."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5327,16 +5031,11 @@ msgstr "Solo lectura"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de tener una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la búsqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que este buscando."
+msgstr "La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y protege al servidor LDAP de tener una mayor carga. La manera mas fácil de manipular grandes bases de datos sin grandes perdidas de tiempo es limitar la búsqueda a valores pequeños y usar filtros para encontrar las entradas que este buscando."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5344,16 +5043,13 @@ msgstr "Por favor elija la forma de reaccionar en esta sesión"
 
 #: ihtml/themes/default/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignore este error y muestre todas las entradas devueltas por el servidor LDAP"
+msgstr "ignore este error y muestre todas las entradas devueltas por el servidor LDAP"
 
 #: ihtml/themes/default/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"ignore este error y muestre todas las entradas que coincidan con el tamaño "
-"limite definido y active el uso de filtros en su lugar"
+msgstr "ignore este error y muestre todas las entradas que coincidan con el tamaño limite definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5421,17 +5117,11 @@ msgstr "Entrando"
 msgid "Session expires in %d!"
 msgstr "La sesión expira en %d!"
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "Menú principal de FusionDirectory"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Esto puede ser utilizado por varios grupos. Por favor verifique si realmente "
-"quiere hacer esto ya que FusionDirectory no tiene forma de recuperar su data."
+msgstr "Esto puede ser utilizado por varios grupos. Por favor verifique si realmente quiere hacer esto ya que FusionDirectory no tiene forma de recuperar su data."
 
 #: ihtml/themes/default/logout-close.tpl.c:2
 msgid "Your FusionDirectory session has been closed!"
@@ -5441,9 +5131,7 @@ msgstr "¡Su sesión de FusionDirectory se ha cerrado!"
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Por favor cierre la ventana del navegador y limpie la cache para evitar una "
-"reautentificación automática de su navegador."
+msgstr "Por favor cierre la ventana del navegador y limpie la cache para evitar una reautentificación automática de su navegador."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5451,20 +5139,17 @@ msgstr "Cambie su contraseña"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Este dialogo le permite cambiar de forma sencilla la contraseña. Introduzca "
-"la contraseña actual y la nueva contraseña (dos veces) en los campos "
-"siguientes y presione en el botón 'Cambiar'."
+msgstr "Este dialogo le permite cambiar de forma sencilla la contraseña. Introduzca la contraseña actual y la nueva contraseña (dos veces) en los campos siguientes y presione en el botón 'Cambiar'."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Contraseña actual"
 
@@ -5477,24 +5162,17 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr ""
-"Algunos valores deben ser únicos en el directorio completo mientras que "
-"algunas combinaciones no tienen sentido. FusionDirectory muestra los "
-"atributos relevantes. Por favor mantenga los valores de abajo para cumplir "
-"con las políticas."
+msgstr "Algunos valores deben ser únicos en el directorio completo mientras que algunas combinaciones no tienen sentido. FusionDirectory muestra los atributos relevantes. Por favor mantenga los valores de abajo para cumplir con las políticas."
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
+msgstr "¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr ""
-"O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente, "
-"puede resultar en errores al pegar el objeto nuevamente!"
+msgstr "O, si copia o corta una entrada en FusionDirectory y borra el objeto fuente, puede resultar en errores al pegar el objeto nuevamente!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5516,8 +5194,7 @@ msgstr "Confirmar contraseña"
 
 #: setup/setup_ldap.tpl.c:2
 msgid "Please choose the LDAP user to be used by FusionDirectory"
-msgstr ""
-"Por favor seleccione el usuario LDAP a ser utilizado por FusionDirectory"
+msgstr "Por favor seleccione el usuario LDAP a ser utilizado por FusionDirectory"
 
 #: setup/setup_ldap.tpl.c:5
 msgid "Search"
@@ -5613,10 +5290,7 @@ msgid ""
 "FusionDirectory supports several encryption types for your passwords. "
 "Normally this is adjustable via user templates, but you can specify a "
 "default method to be used here, too."
-msgstr ""
-"FusionDirectory soporta varios tipos de encripción para sus claves. "
-"Normalmente esto es ajustable mediante las plantillas de usuario, pero puede "
-"también especificar un método por defecto aquí."
+msgstr "FusionDirectory soporta varios tipos de encripción para sus claves. Normalmente esto es ajustable mediante las plantillas de usuario, pero puede también especificar un método por defecto aquí."
 
 #: setup/setup_config1.tpl.c:68
 msgid ""
@@ -5624,44 +5298,28 @@ msgid ""
 "This is a workaround till OpenLDAP's in directory ACI's are    fully "
 "implemented. For this to work, we need the admin DN and the corresponding "
 "password."
-msgstr ""
-"FusionDirectory siempre actúa como administrador y maneja los derechos de "
-"acceso internamente. Esto es un atajo hasta que los ACLs definidos en "
-"directorio en OpenLDAP estén completamente implementados. Para que esto "
-"funcione, necesitamos el DN del administrador y su clave correspondiente."
+msgstr "FusionDirectory siempre actúa como administrador y maneja los derechos de acceso internamente. Esto es un atajo hasta que los ACLs definidos en directorio en OpenLDAP estén completamente implementados. Para que esto funcione, necesitamos el DN del administrador y su clave correspondiente."
 
 #: setup/setup_config1.tpl.c:71
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where "
 "FusionDirectory saves people and groups, including the way accounts get "
 "created. Check the values below if the fit your needs."
-msgstr ""
-"Algunos parámetros básicos de LDAP son ajustables y afectan las locaciones "
-"donde FusionDirectory guarda grupos y usuarios, incluyendo la forma en que "
-"las cuentas son creadas. Revise los valores debajo para ajustarlos a sus "
-"necesidades."
+msgstr "Algunos parámetros básicos de LDAP son ajustables y afectan las locaciones donde FusionDirectory guarda grupos y usuarios, incluyendo la forma en que las cuentas son creadas. Revise los valores debajo para ajustarlos a sus necesidades."
 
 #: setup/setup_config1.tpl.c:74
 msgid ""
 "FusionDirectory has modular support for several mail methods. These methods "
 "provide interfaces to users mailboxes and general handling    for quotas. "
 "You can choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"FusionDirectory tiene soporte modular para varios métodos de correo. Estos "
-"métodos proveen interfaces a los buzones de los usuarios y el manejo general "
-"de las cuotas. Puede seleccionar el complemento \"dummy\" para mantener su "
-"configuración de correo intacta."
+msgstr "FusionDirectory tiene soporte modular para varios métodos de correo. Estos métodos proveen interfaces a los buzones de los usuarios y el manejo general de las cuotas. Puede seleccionar el complemento \"dummy\" para mantener su configuración de correo intacta."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
-msgstr ""
-"Durante la inspección del LDAP vamos a verificar varios problemas comunes "
-"que pueden ocurrir durante la migración a administración por FusionDirectory "
-"de la base LDAP. Puede querer reparar los problemas debajo, para proveer un "
-"servicio mas eficiente."
+msgstr "Durante la inspección del LDAP vamos a verificar varios problemas comunes que pueden ocurrir durante la migración a administración por FusionDirectory de la base LDAP. Puede querer reparar los problemas debajo, para proveer un servicio mas eficiente."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -5697,19 +5355,14 @@ msgstr "Mover grupos en el árbol de grupos configurado"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Este dialogo le permite mover una pareja de grupos al árbol de grupos "
-"configurados. Hacer esto puede reforzar su servicio LDAP."
+msgstr "Este dialogo le permite mover una pareja de grupos al árbol de grupos configurados. Hacer esto puede reforzar su servicio LDAP."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos "
-"grupos. La instalación de FusionDirectory no puede migrar referencias, así "
-"que puede querer cancelar la migración en estos casos."
+msgstr "Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos grupos. La instalación de FusionDirectory no puede migrar referencias, así que puede querer cancelar la migración en estos casos."
 
 #: setup/setup_migrate.tpl.c:32
 msgid "Move selected groups into this group tree"
@@ -5737,19 +5390,14 @@ msgstr "Mover usuarios al árbol de usuarios configurado"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Este dialogo le permite mover una pareja de usuarios al árbol de usuarios "
-"configurados. Hacer esto puede reforzar su servicio LDAP."
+msgstr "Este dialogo le permite mover una pareja de usuarios al árbol de usuarios configurados. Hacer esto puede reforzar su servicio LDAP."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos "
-"usuarios. La instalación de FusionDirectory no puede migrar referencias, así "
-"que puede querer cancelar la migración en estos casos."
+msgstr "Tenga cuidado con esta opción! Pueden haber referencias apuntando a estos usuarios. La instalación de FusionDirectory no puede migrar referencias, así que puede querer cancelar la migración en estos casos."
 
 #: setup/setup_migrate.tpl.c:59
 msgid "Move selected users into this people tree"
@@ -5763,9 +5411,7 @@ msgstr "Migrar cuentas administrativas GOsa versión 2.5"
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into "
 "FusionDirectory 1.0 useable accounts."
-msgstr ""
-"Este dialogo permite la migración de las cuentas administrador de GOsa 2.5 a "
-"cuentas utilizables por FusionDirectory 1.0."
+msgstr "Este dialogo permite la migración de las cuentas administrador de GOsa 2.5 a cuentas utilizables por FusionDirectory 1.0."
 
 #: setup/setup_migrate.tpl.c:107
 msgid "Abort"
@@ -5779,9 +5425,7 @@ msgstr "Crear una nueva cuenta administrador de FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol "
-"LDAP."
+msgstr "Este dialogo añadirá automáticamente un nuevo superadministrador a su árbol LDAP."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
@@ -5796,10 +5440,7 @@ msgid ""
 "The listed departments are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of entries, select them "
 "and use the migrate button below."
-msgstr ""
-"Los departamentos listados son actualmente invisibles en la interfaz de "
-"usuario de FusionDirectory. Si quiere cambiar esto para algunas entradas, "
-"selecciónelas y utilice el botón de \"migrar\" debajo."
+msgstr "Los departamentos listados son actualmente invisibles en la interfaz de usuario de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
 #: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
@@ -5807,34 +5448,26 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Si quiere saber que se hará cuando se migren las entradas seleccionadas use "
-"el botón 'Mostrar cambios' para ver el LDIF."
+msgstr "Si quiere saber que se hará cuando se migren las entradas seleccionadas use el botón 'Mostrar cambios' para ver el LDIF."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
 "The listed users are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of users, just select "
 "them and use the 'Migrate' button below."
-msgstr ""
-"Los usuarios listados son actualmente invisibles en la interfaz de usuario "
-"de FusionDirectory. Si quiere cambiar esto para algunas entradas, "
-"selecciónelas y utilice el botón de \"migrar\" debajo."
+msgstr "Los usuarios listados son actualmente invisibles en la interfaz de usuario de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Los dispositivos listados son actualmente invisibles en la interfaz de "
-"FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas "
-"y utilice el botón de \"migrar\" debajo."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr "Los dispositivos listados son actualmente invisibles en la interfaz de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "Refresco"
 
@@ -5843,20 +5476,14 @@ msgid ""
 "The listed services are currently invalid for the FusionDirectory version "
 "you are going to install. If you want to update a couple of service, just "
 "select them and use the 'Migrate' button below."
-msgstr ""
-"Los servicios listados son actualmente inválidos para la versión de "
-"FusionDirectory que va a instalar. Si quiere actualizar algunos servicios, "
-"selecciónelos y utilice el botón de \"migrar\" debajo."
+msgstr "Los servicios listados son actualmente inválidos para la versión de FusionDirectory que va a instalar. Si quiere actualizar algunos servicios, selecciónelos y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Los menús listados son actualmente invisibles en la interfaz de "
-"FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas "
-"y utilice el botón de \"migrar\" debajo."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr "Los menús listados son actualmente invisibles en la interfaz de FusionDirectory. Si quiere cambiar esto para algunas entradas, selecciónelas y utilice el botón de \"migrar\" debajo."
 
 #: setup/setup_feedback.tpl.c:2
 msgid "Feedback successfully send"
@@ -5876,11 +5503,9 @@ msgstr "Enviar comentarios al equipo del proyecto FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
-msgstr ""
-"Cuando se selecciona esta opción, FusionDirectory intentará conectar con "
-"http://www.fusiondirectory.org para enviar su formulario de manera anónima."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr "Cuando se selecciona esta opción, FusionDirectory intentará conectar con http://www.fusiondirectory.org para enviar su formulario de manera anónima."
 
 #: setup/setup_feedback.tpl.c:26
 msgid "Did the setup procedure help you to get started?"
@@ -5939,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr "Que capacidades de FusionDirectory utiliza?"
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr "Que capacidades desea ver en versiones futuras de FusionDirectory?"
 
 #: setup/setup_feedback.tpl.c:83
@@ -5953,12 +5579,9 @@ msgstr "Por favor seleccione su idioma preferido"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"En este punto, puede seleccionar el idioma usado por defecto. Seleccionando "
-"'automático' obtendrá el lenguaje usado por el navedador. Esta configuración "
-"puede ser modificada por cada usuario."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "En este punto, puede seleccionar el idioma usado por defecto. Seleccionando 'automático' obtendrá el lenguaje usado por el navedador. Esta configuración puede ser modificada por cada usuario."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -5972,27 +5595,27 @@ msgstr "Por favor introduzca su zona horaria preferida aquí"
 msgid "FusionDirectory core settings"
 msgstr "Configuración central de FusionDirectory"
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Activar edición de bloqueo"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr "Registros de FusionDirectory"
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Forzar register_globals para que sea desactivado"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Mostrar errores PHP:"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Activado"
 
@@ -6013,10 +5636,7 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr ""
-"Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos "
-"ninguna configuración hasta el momento. Este simple asistente trata de "
-"ayudarlo a configurar."
+msgstr "Esta parece ser la primera vez que inicia FusionDirectory - no conseguimos ninguna configuración hasta el momento. Este simple asistente trata de ayudarlo a configurar."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -6048,9 +5668,7 @@ msgstr "Encontrar cada posible error de configuración"
 
 #: setup/setup_welcome.tpl.c:26
 msgid "Migrate every possible LDAP setup - create backup dumps!"
-msgstr ""
-"Migración asistidas de cualquier configuración LDAP - ¡creando copias de "
-"seguridad!"
+msgstr "Migración asistidas de cualquier configuración LDAP - ¡creando copias de seguridad!"
 
 #: setup/setup_welcome.tpl.c:29
 msgid "To continue..."
@@ -6062,11 +5680,7 @@ msgid ""
 "creating the file '/tmp/fusiondirectory.auth', containing the current "
 "session ID on the servers local filesystem. This can be done by executing "
 "the following command:"
-msgstr ""
-"Por razones de seguridad debe autenticarse para la instalación creando el "
-"archivo '/tmp/fusiondirectory.auth', conteniendo el ID de la sesión actual "
-"en el sistema de archivos del servidor. Esto puede ser hecho ejecutando el "
-"siguiente comando: "
+msgstr "Por razones de seguridad debe autenticarse para la instalación creando el archivo '/tmp/fusiondirectory.auth', conteniendo el ID de la sesión actual en el sistema de archivos del servidor. Esto puede ser hecho ejecutando el siguiente comando: "
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -6114,11 +5728,9 @@ msgstr "Ha fallado la comprobación del esquema"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"No se puede acceder a la información de esquemas, todos las comprobaciones "
-"se suspenden. Ajuste las acl de ldap."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "No se puede acceder a la información de esquemas, todos las comprobaciones se suspenden. Ajuste las acl de ldap."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
@@ -6167,9 +5779,7 @@ msgstr "Este objeto no tiene relación con otros objetos"
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en "
-"todos los programas configurados también."
+msgstr "Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en todos los programas configurados también."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6182,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Para cambiar su contraseña personal use los campos siguientes. Los cambios "
-"tendrán efecto inmediato. Por favor memorice la nueva contraseña, porque no "
-"podrá entrar sin ella."
+msgstr "Para cambiar su contraseña personal use los campos siguientes. Los cambios tendrán efecto inmediato. Por favor memorice la nueva contraseña, porque no podrá entrar sin ella."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6193,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Cambiar la contraseña modifica la autenticación del usuario para el correo, "
-"proxy, samba y los servicios unix."
+msgstr "Cambiar la contraseña modifica la autenticación del usuario para el correo, proxy, samba y los servicios unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "Su contraseña ha caducado. ¡Por favor seleccione una nueva!"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
-msgstr "Reintroducir nueva contraseña"
+msgstr "Reintroduzca la contraseña"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Diálogo de cambio de contraseña"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "Usar propuesta"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "Especificar una contraseña manualmente"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Introducir contraseña"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Limpiar información"
 
@@ -6241,55 +5841,10 @@ msgstr "Limpiar información"
 msgid "Your password hash method will not be changed!"
 msgstr "No se cambiará su método de hash de la contraseña!"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificados"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Certificado estándar"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Certificado S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Certificado PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Número de serie del certificado"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Foto"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Eliminar foto"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Caracteristicas del usuario"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Apellido"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Nombre"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Borrar Contraseña"
@@ -6298,59 +5853,17 @@ msgstr "Borrar Contraseña"
 msgid "Set new password"
 msgstr "Introducir nueva contraseña"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Información personal"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Cambiar foto"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nombre de la plantilla"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Idioma preferido"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Teléfono privado"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Almacén de claves"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Restringir inicio de sesión a"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP o Red"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Información corporativa"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Número departamento"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Número empleado"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Foto"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Número sala"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Foto del usuario"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Por favor use la sección telefóno"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Eliminar foto"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6367,23 +5880,6 @@ msgstr "Mostrar grupos de samba"
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr "Mostrar Computadora Windows"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6402,15 +5898,6 @@ msgstr "Nombre de la localidad a crear"
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Marcar departamento como una unidad administrativa independiente"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Procesando la operación solicitada"
@@ -6419,9 +5906,7 @@ msgstr "Procesando la operación solicitada"
 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."
+msgstr "Su navegador no soporta IFRAMES, porfavor use este enlace para ejecutar la operación solicitada."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6435,9 +5920,7 @@ msgstr "Está actualmente moviendo/renombrando este departamento."
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"Modificar un atributo 'ou' de un departamento puede corromper acls e "
-"instantaneas de todos los objetos."
+msgstr "Modificar un atributo 'ou' de un departamento puede corromper acls e instantaneas de todos los objetos."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6447,9 +5930,7 @@ msgstr "FusionDirectory NO puede reparar esto por usted, aun. "
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Antes de que confirme la acción, asegurese que todo sera como espera, se "
-"recomienda que realize un backup."
+msgstr "Antes de que confirme la acción, asegurese que todo sera como espera, se recomienda que realize un backup."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6494,20 +5975,14 @@ msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. 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 cuentas, sistemas, etc. en este sub-árbol. Por "
-"favor verifique si realmente quiere hacer esto ya que no hay forma para que "
-"FusionDirectory recupere la data."
+msgstr "Esto incluye 'todas' las cuentas, sistemas, etc. en este sub-árbol. Por favor verifique si realmente quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
 
 #: plugins/admin/departments/remove.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."
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6537,9 +6012,7 @@ msgstr "Aplicando una plantilla"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Aplicar una plantilla a usuarios reemplazará los valores de estos por los "
-"definidos en la plantilla."
+msgstr "Aplicar una plantilla a usuarios reemplazará los valores de estos por los definidos en la plantilla."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6554,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Crear un nuevo usuario es mas fácil si usa plantillas. Algunos valores en la "
-"base de datos serán introducidos automáticamente. Elegir 'ninguno' para "
-"anular el uso de plantillas."
+msgstr "Crear un nuevo usuario es mas fácil si usa plantillas. Algunos valores en la base de datos serán introducidos automáticamente. Elegir 'ninguno' para anular el uso de plantillas."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6581,33 +6051,23 @@ msgstr "Mostrar los usuarios samba"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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"
 
 #: plugins/admin/users/password.tpl.c:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Para cambiar la contraseña del usuario use los campos a continuación. Los "
-"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
-"contraseña, el usuario no podrá autenticarse sin ella."
+msgstr "Para cambiar la contraseña del usuario use los campos a continuación. Los cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Seguridad"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "Dialogo de entrada de clave"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Forzar el cambio de contraseña en el próximo inicio."
 
@@ -6640,9 +6100,7 @@ msgstr "Nombre Posix del grupo"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalmente los IDs son generados automáticamente, seleccione para indicar "
-"manualmente"
+msgstr "Normalmente los IDs son generados automáticamente, seleccione para indicar manualmente"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6658,10 +6116,7 @@ msgstr "Forzar número ID"
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Este puede ser un grupo primario de usuario. Por favor verifique si "
-"realmente quiere hacer esto ya que no hay forma para que FusionDirectory "
-"recupere la data."
+msgstr "Este puede ser un grupo primario de usuario. Por favor verifique si realmente quiere hacer esto ya que no hay forma para que FusionDirectory recupere la data."
 
 #: plugins/admin/groups/trust_machines.tpl.c:2
 #: plugins/admin/ogroups/trust_machines.tpl.c:2
@@ -6760,6 +6215,11 @@ msgstr "Mostrar servidor"
 msgid "Show workstation"
 msgstr "Mostrar estación de trabajo"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr "Mostrar Computadora Windows"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "Mostrar terminal"
@@ -6824,11 +6284,14 @@ msgstr "Nombre del grupo"
 msgid "Member objects"
 msgstr "Objetos miembros"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Edición multiple"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Mostrar servidores"
 
-#~ msgid "In all groups"
-#~ msgstr "en todos los grupos"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
 
-#~ msgid "Not in all groups"
-#~ msgstr "no en todos los grupos"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Mostrar terminales"
diff --git a/locale/fa_IR.po b/locale/fa_IR.po
new file mode 100644
index 0000000000000000000000000000000000000000..1d001c19b85845d2f7f572b79dd60457bc5108a8
--- /dev/null
+++ b/locale/fa_IR.po
@@ -0,0 +1,6297 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: FusionDirectory-develop\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian (Iran) <biabani.mohammad@gmail.com>\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"
+
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
+msgid "FusionDirectory settings 3/3"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:75
+msgid "Tweak some FusionDirectory core behaviour"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
+#: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
+#: setup/setup_feedback.tpl.c:44
+msgid "No"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
+#: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
+#: setup/setup_feedback.tpl.c:41
+msgid "Yes"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
+msgid "Setup error"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:278
+msgid "Session lifetime must be a numeric value!"
+msgstr ""
+
+#: setup/class_setupStep_Config3.inc:282
+msgid "Maximum LDAP query time must be a numeric value!"
+msgstr ""
+
+#: setup/class_setupStep_Schema.inc:42 setup/class_setupStep_Schema.inc:43
+msgid "LDAP schema check"
+msgstr ""
+
+#: setup/class_setupStep_Schema.inc:44
+msgid "Perform test on your current LDAP schema"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:41 setup/class_setupStep_Language.inc:42
+msgid "Language setup"
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:43
+msgid "This step allows you to select your preferred language."
+msgstr ""
+
+#: setup/class_setupStep_Language.inc:50
+#: plugins/config/class_configInLdap.inc:404
+msgid "Automatic"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
+msgid "LDAP inspection"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:123
+msgid "Analyze your current LDAP for FusionDirectory compatibility"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:129
+msgid "Checking for root object"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:135
+msgid "Inspecting object classes in root object"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:141
+msgid "Checking permission for LDAP database"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:147
+msgid "Checking for invisible departments"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:152
+msgid "Checking for invisible users"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
+msgid "Checking for super administrator"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:165
+msgid "Checking for users outside the people tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:171
+msgid "Checking for groups outside the groups tree"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:178
+msgid "Checking for duplicated UID numbers"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:184
+msgid "Checking for duplicate GID numbers"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:190
+msgid "Checking for old style USB devices"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:196
+msgid "Checking for old services that have to be migrated"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:202
+msgid "Checking for old style application menus"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
+msgid "LDAP query failed"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
+msgid "Possibly the 'root object' is missing."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
+#: ihtml/themes/default/msg_dialog.tpl.c:5
+#: ihtml/themes/default/msg_dialog.tpl.c:23
+#: ihtml/themes/default/simple-remove.tpl.c:2
+#: ihtml/themes/default/islocked.tpl.c:5 ihtml/themes/default/remove.tpl.c:2
+#: setup/setup_checks.tpl.c:11 setup/setup_checks.tpl.c:32
+#: plugins/admin/departments/dep_move_confirm.tpl.c:2
+#: plugins/admin/departments/remove.tpl.c:2 plugins/admin/users/remove.tpl.c:2
+#: plugins/admin/groups/remove.tpl.c:2 plugins/admin/acl/remove.tpl.c:2
+#: plugins/admin/ogroups/remove.tpl.c:2
+msgid "Warning"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:251
+#, php-format
+msgid "Found %s duplicate values for attribute 'uidNumber'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
+#: ihtml/themes/default/msg_dialog.tpl.c:11
+#: ihtml/themes/default/msg_dialog.tpl.c:14
+#: ihtml/themes/default/msg_dialog.tpl.c:29
+#: ihtml/themes/default/msg_dialog.tpl.c:32
+#: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
+#: setup/setup_checks.tpl.c:26
+msgid "Ok"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:303
+#, php-format
+msgid "Found %s duplicate values for attribute 'gidNumber'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:374
+#, php-format
+msgid "Found %s groups outside the configured tree '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
+msgid "Move"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:451
+#, php-format
+msgid "Found %s user(s) outside the configured tree '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
+msgid "Failed"
+msgstr "خطا"
+
+#: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:525
+#, php-format
+msgid ""
+"The specified user '%s' does not have full access to your ldap database."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:589
+#, php-format
+msgid ""
+"Found %s user(s) that will not be visible in FusionDirectory or which are "
+"incomplete."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
+msgid "Migrate"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
+msgid "Migration error"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#, php-format
+msgid "Cannot migrate department '%s':"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:729
+#, php-format
+msgid "Found %s department(s) that will not be visible in FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:952
+#, php-format
+msgid "GOsa 2.5 administrative accounts found: %s"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:957
+msgid ""
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
+#: plugins/admin/departments/dep-list.xml:98
+#: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
+#: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
+#: include/simpleplugin/simple-list.xml:59
+msgid "Create"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
+msgid "Users"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
+msgid "Groups"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:974
+msgid "There is no FusionDirectory administrator account inside your LDAP."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1043
+#, php-format
+msgid "Cannot add ACL for user '%s':"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
+msgid "Input error"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1081
+msgid "Uid"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1086
+msgid "Password error"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1086
+msgid "Provided passwords do not match!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1091
+msgid "Specify a valid user ID!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
+#: plugins/admin/ogroups/class_ogroup.inc:209
+#: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
+#: include/class_msgPool.inc:235 include/class_msgPool.inc:265
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
+#: include/password-methods/class_password-methods-sasl.inc:51
+#: include/password-methods/class_password-methods-sasl.inc:63
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
+#: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
+#: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
+#: setup/setup_checks.tpl.c:29
+msgid "Error"
+msgstr "خطا"
+
+#: setup/class_setupStep_Migrate.inc:1125
+#, php-format
+msgid "Adding an administrative user failed: object '%s' already exists!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
+#: plugins/admin/groups/class_group.inc:989
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
+#: plugins/admin/ogroups/class_ogroup.inc:863
+#: plugins/admin/ogroups/class_ogroup.inc:877
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
+msgid "LDAP error"
+msgstr "خطای LDAP"
+
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+msgid "Cannot move users to the requested department!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1173
+msgid "Group will be moved from"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
+msgid "to"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1183
+msgid "Updating following references too"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1221
+msgid "User will be moved from"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1231
+msgid "The following references will be updated"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1800
+msgid ""
+"The LDAP root object is missing. It is required to use your LDAP service."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
+msgid "Try to create root object"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1813
+msgid "Root object couldn't be created, you should try it on your own."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1868
+#, php-format
+msgid "Missing FusionDirectory object class '%s'!"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1869
+msgid "Please check your installation."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:1890
+#, php-format
+msgid ""
+"Cannot handle the structural object type of your root object. Please try to "
+"add the object class '%s' manually."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2204
+#, php-format
+msgid "Copy '%s' to '%s' failed:"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2335
+#, php-format
+msgid "There are %s devices that need to be migrated."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2395
+#, php-format
+msgid "Adding '%s' to the LDAP failed: %s"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
+#, php-format
+msgid "Updating '%s' failed: %s"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2491
+#, php-format
+msgid "There are %s services that need to be migrated."
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2631
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
+#: include/class_msgPool.inc:503
+#, php-format
+msgid "Add"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2632
+#: plugins/admin/departments/dep-list.xml:160
+#: plugins/admin/departments/dep-list.xml:181
+#: plugins/admin/users/user-list.xml:121
+#: plugins/admin/groups/group-list.xml:115 plugins/admin/acl/acl-list.xml:95
+#: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
+#: include/simpleplugin/simple-list.xml:73
+#: include/simpleplugin/simple-list.xml:122
+msgid "Remove"
+msgstr ""
+
+#: setup/class_setupStep_Migrate.inc:2789
+#, php-format
+msgid "There are %s application menus which have to be migrated."
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:38
+msgid "Welcome"
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:39
+msgid "The welcome message"
+msgstr ""
+
+#: setup/class_setupStep_Welcome.inc:40
+msgid "Welcome to FusionDirectory setup wizard"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:38 setup/class_setupStep_Checks.inc:39
+msgid "Installation check"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:40
+msgid "Basic checks for PHP compatibility and extensions"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:64
+msgid "Checking PHP version"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:65
+#, php-format
+msgid "PHP must be of version %s or above."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:66
+msgid "Please upgrade to a supported version."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:73
+msgid "FusionDirectory requires this module to talk with your LDAP server."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:81
+msgid ""
+"FusionDirectory requires this module for an internationalized interface."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:89
+msgid ""
+"FusionDirectory requires this module to communicate with different types of "
+"servers and protocols."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:97
+msgid "FusionDirectory requires this module for the samba integration."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:105
+msgid ""
+"FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
+"SSHA encryption."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:113
+msgid "FusionDirectory requires this module to talk to an IMAP server."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:120
+msgid "mbstring"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:121
+msgid "FusionDirectory requires this module to handle unicode strings."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:128
+msgid "MDB2"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:129
+msgid ""
+"FusionDirectory requires this module to communicate with several supported "
+"databases."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:134
+msgid ""
+"If you do not want to install MDB2 and won't use databases, remove the "
+"class_databaseManagement.inc file."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:138
+msgid "imagick"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:139
+msgid "FusionDirectory requires this extension to handle images."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:154
+msgid "compression module"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:155
+msgid "FusionDirectory requires this extension to handle snapshots."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:166
+msgid ""
+"register_globals is a PHP mechanism to register all global variables to be "
+"accessible from scripts without changing the scope. This may be a security "
+"risk."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:167
+msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:175
+msgid "PHP uses this value for the garbage collector to delete old sessions."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:176
+msgid ""
+"Setting this value to one day will prevent loosing session and cookies "
+"before they really timeout."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:177
+msgid ""
+"Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
+"higher."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
+#: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
+msgid "Off"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:185
+msgid ""
+"In Order to use FusionDirectory without any trouble, the session.auto_start "
+"option in your php.ini should be set to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:186
+msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:193
+msgid ""
+"FusionDirectory needs at least 128MB of memory. Setting it below this limit "
+"may cause errors that are not reproducable! Increase it for larger setups."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:194
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:201
+msgid ""
+"This option influences the PHP output handling. Turn this Option off, to "
+"increase performance."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:202
+msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:209
+msgid "The Execution time should be at least 30 seconds."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:210
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:217
+msgid ""
+"Increase the server security by setting expose_php to 'off'. PHP won't send "
+"any information about the server you are running in this case."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:218
+msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:225
+msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:226
+msgid ""
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:236
+msgid "Configuration writeable"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:237
+msgid "The configuration file can't be written"
+msgstr ""
+
+#: setup/class_setupStep_Checks.inc:238
+#, php-format
+msgid ""
+"FusionDirectory reads its configuration from a file located in (%s/%s). The "
+"setup can write the configuration directly if it is writeable."
+msgstr ""
+
+#: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
+msgid "FusionDirectory settings 2/3"
+msgstr ""
+
+#: setup/class_setupStep_Config2.inc:54
+msgid "Customize special parameters"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:55
+msgid "LDAP setup"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:56
+msgid "LDAP connection setup"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:57
+msgid ""
+"This dialog performs the basic configuration of the LDAP connectivity for "
+"FusionDirectory."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:117
+#, php-format
+msgid "Anonymous bind to server '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:119
+#, php-format
+msgid "Bind as user '%s' failed!"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:124
+#, php-format
+msgid "Anonymous bind to server '%s' succeeded."
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:125
+msgid "Please specify user and password!"
+msgstr ""
+
+#: setup/class_setupStep_Ldap.inc:127
+#, php-format
+msgid "Bind as user '%s' to server '%s' succeeded!"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:36
+#: ihtml/themes/default/copyPasteDialog.tpl.c:26
+msgid "Finish"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:37
+msgid "Write configuration file"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:38
+msgid "Finish - write the configuration file"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:103
+msgid ""
+"Your configuration file is currently world readable. Please update the file "
+"permissions!"
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:105
+msgid "The configuration is currently not readable or it does not exists."
+msgstr ""
+
+#: setup/class_setupStep_Finish.inc:111
+#, php-format
+msgid ""
+"After downloading and placing the file under %s, please make sure that the "
+"user the webserver is running with is able to read %s, while other users "
+"shouldn't."
+msgstr ""
+
+#: setup/class_setup.inc:198
+msgid "Completed"
+msgstr ""
+
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
+msgid "Next"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:76 setup/class_setupStep_Config1.inc:77
+msgid "FusionDirectory settings 1/3"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:78
+msgid "FusionDirectory generic settings"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:121
+#, php-format
+msgid "The specified value for '%s' must be a numeric value"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:121 setup/setup_config1.tpl.c:32
+msgid "GID / UID min id"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:125 setup/class_setupStep_Config1.inc:129
+#, php-format
+msgid "Don't add a trailing comma to '%s'."
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:125
+msgid "People storage ou"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:129
+msgid "Group storage ou"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:133
+msgid "Uid base must be numeric"
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:137
+msgid "The given password minimum length is not numeric."
+msgstr ""
+
+#: setup/class_setupStep_Config1.inc:140
+msgid "The given password differ value is not numeric."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:126
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password method"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:127
+msgid "Error: Password method not available!"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
+msgid "Fatal error"
+msgstr "خطا"
+
+#: html/class_passwordRecovery.inc:228
+#, php-format
+msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
+#: include/password-methods/class_password-methods-sha.inc:71
+#: include/password-methods/class_password-methods-ssha.inc:75
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
+msgid "Configuration error"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
+#, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:403
+#: plugins/personal/password/class_password.inc:113
+#: plugins/admin/users/class_userManagement.inc:313
+msgid ""
+"The passwords you've entered as 'New password' and 'Repeated new password' "
+"do not match."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
+#: ihtml/themes/default/recovery.tpl.c:41
+#: ihtml/themes/default/recovery.tpl.c:44
+#: ihtml/themes/default/password.tpl.c:44
+#: ihtml/themes/default/password.tpl.c:47
+#: ihtml/themes/default/accountexpired.tpl.c:11
+#: ihtml/themes/default/accountexpired.tpl.c:14
+#: plugins/personal/password/password.tpl.c:14
+#: plugins/personal/password/password.tpl.c:35
+#: plugins/personal/generic/password.tpl.c:11
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
+msgid "New password"
+msgstr "کلمه عبور جدید"
+
+#: html/class_passwordRecovery.inc:407
+msgid "The password used as new is too short."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:409
+#: plugins/personal/password/class_password.inc:121
+msgid "The password contains possibly problematic Unicode characters!"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:434
+msgid "Session will not be encrypted."
+msgstr ""
+
+#: html/class_passwordRecovery.inc:436
+msgid "Enter SSL session"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:477
+#, php-format
+msgid "Did not found account %s"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:480
+#, php-format
+msgid "Found multiple accounts %s"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
+msgid "Adresse mail"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:511
+#, php-format
+msgid "There is no account using email %s"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:514
+#, php-format
+msgid "There are several accounts using email %s"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:562
+msgid "Contact your administrator, there was a problem with mail server"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:573
+msgid "This token is invalid"
+msgstr ""
+
+#: html/class_passwordRecovery.inc:611
+msgid "External password changer reported a problem: "
+msgstr ""
+
+#: html/class_passwordRecovery.inc:636
+msgid "There was a problem with mail server, confirmation email not sent"
+msgstr ""
+
+#: html/setup.php:63
+msgid "Smarty"
+msgstr ""
+
+#: html/main.php:136
+#, php-format
+msgid "Cannot locate file '%s' - please run '%s' to fix this"
+msgstr "فایل '%s' را نمی توانم پیدا کنم برای رفع مشکل دستور '%s' را بزنید."
+
+#: html/main.php:152
+msgid "PHP configuration"
+msgstr "پیکربندی PHP"
+
+#: html/main.php:153
+msgid ""
+"Fatal error: Register globals is on. FusionDirectory will refuse to login "
+"unless this is fixed by an administrator."
+msgstr ""
+
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:390
+#: ihtml/themes/default/password.tpl.c:20
+msgid "Password change"
+msgstr "تغییر کلمه عبور"
+
+#: html/main.php:183
+msgid "Your password is about to expire, please change your password!"
+msgstr "اعتبار کلمه عبور شما در حال اتمام است، لطفا کلمه عبور خود را تغییر دهید!"
+
+#: html/main.php:253
+msgid "Running out of memory!"
+msgstr ""
+
+#: html/main.php:309
+msgid "User ACL checks disabled"
+msgstr ""
+
+#: html/main.php:354
+msgid "Plugin"
+msgstr "پلاگین"
+
+#: html/main.php:355
+#, php-format
+msgid ""
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
+msgstr ""
+
+#: html/main.php:370
+msgid "Configuration Error"
+msgstr ""
+
+#: html/main.php:371
+#, php-format
+msgid ""
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
+msgstr ""
+
+#: html/index.php:59
+msgid "Session is not encrypted!"
+msgstr ""
+
+#: html/index.php:66
+msgid ""
+"The session lifetime configured in your fusiondirectory.conf will be "
+"overridden by php.ini settings."
+msgstr ""
+
+#: html/index.php:148
+#, php-format
+msgid ""
+"FusionDirectory configuration %s/%s is not readable. Please run "
+"fusiondirectory-setup --check-config to fix this."
+msgstr ""
+
+#: html/index.php:164
+msgid "Smarty error"
+msgstr ""
+
+#: html/index.php:209
+msgid "There is a problem with the authentication setup!"
+msgstr ""
+
+#: html/index.php:217
+msgid "Cannot find a valid user for the current authentication setup!"
+msgstr ""
+
+#: html/index.php:221
+msgid "User information is not unique across the configured LDAP trees!"
+msgstr ""
+
+#: html/index.php:270
+msgid "Cannot detect information about the installed LDAP schema!"
+msgstr ""
+
+#: html/index.php:283
+msgid "Your LDAP setup contains old schema definitions:"
+msgstr ""
+
+#: html/index.php:306
+msgid "Please specify a valid username!"
+msgstr ""
+
+#: html/index.php:309
+msgid "Please specify your password!"
+msgstr ""
+
+#: html/index.php:321
+msgid "Authentication error"
+msgstr ""
+
+#: html/index.php:321
+msgid "Cannot retrieve user information for htaccess authentication!"
+msgstr ""
+
+#: html/index.php:328
+msgid "Please check the username/password combination."
+msgstr ""
+
+#: html/index.php:382
+msgid "Account locked. Please contact your system administrator!"
+msgstr ""
+
+#: html/index.php:404
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
+msgid "Hair Information"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
+msgid "Color"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:45
+msgid "Color of the hair"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
+msgid "Length"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
+msgid "Length of the hair in cm"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:65
+msgid "Bicycle"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:68
+msgid "Brand"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:69
+msgid "Brand of the bicycle"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:75
+msgid "Has a bell"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:76
+msgid "Does the bicycle have a bell"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
+msgid "FTP informations"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
+msgid "Informations for ftp login"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
+#: plugins/personal/generic/class_user.inc:209
+#: plugins/admin/users/user-list.xml:65
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
+#: plugins/admin/groups/userSelect/user-list.xml:56
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
+#: plugins/personal/generic/paste_generic.tpl.c:11
+#: plugins/admin/users/template.tpl.c:17
+msgid "Login"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
+msgid "Login for FTP"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
+#: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
+#: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
+#: ihtml/themes/default/recovery.tpl.c:8
+#: ihtml/themes/default/password.tpl.c:14
+#: ihtml/themes/default/password.tpl.c:17 setup/setup_migrate.tpl.c:122
+#: setup/setup_config2.tpl.c:23 setup/setup_config2.tpl.c:38
+#: plugins/personal/generic/paste_generic.tpl.c:14
+msgid "Password"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
+msgid "Password for FTP"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
+msgid "Host"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
+msgid "Host for FTP"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
+msgid "Port"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
+msgid "Port for FTP"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
+msgid "Demo Plugin"
+msgstr ""
+
+#: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
+msgid "Edit some useless personal information"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
+
+#: plugins/generic/welcome/main.inc:26
+#, php-format
+msgid "Welcome %s!"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:41
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
+#: plugins/admin/groups/class_group.inc:1106
+#: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
+msgid "Generic"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:45
+msgid "UNIX"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:49
+#: plugins/admin/groups/class_groupManagement.inc:109
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
+#: ihtml/themes/default/recovery.tpl.c:86
+msgid "Mail"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:53
+#: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
+msgid "Samba"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:57
+msgid "FAX"
+msgstr "فکس"
+
+#: plugins/generic/references/class_reference.inc:61
+msgid "Proxy"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:65
+msgid "FTP"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:69
+#: plugins/personal/posix/groupSelect/group-list.xml:15
+#: plugins/admin/groups/class_group.inc:1111
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
+#: plugins/admin/groups/group-list.xml:15
+#: plugins/admin/groups/group-list.xml:96
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:79
+msgid "Group"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:247
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
+msgid "Department"
+msgstr "دپارتمان"
+
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
+#: plugins/admin/groups/class_groupManagement.inc:125
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
+#: plugins/admin/departments/organization.tpl.c:50
+#: plugins/admin/departments/generic.tpl.c:50
+msgid "Phone"
+msgstr "تلفن"
+
+#: plugins/generic/references/class_reference.inc:81
+#: plugins/admin/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
+msgid "Application"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:85
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
+#: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
+msgid "Server"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:89
+msgid "Thin Client"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:93
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
+msgid "Workstation"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:97
+#: plugins/admin/ogroups/class_ogroup.inc:901
+#: plugins/admin/ogroups/ogroup-list.xml:15
+msgid "Object group"
+msgstr ""
+
+#: plugins/generic/references/class_reference.inc:101
+#: plugins/admin/ogroups/class_ogroupManagement.inc:195
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
+msgid "Printer"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:28
+msgid "Plugins configuration"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:29
+msgid "FusionDirectory plugins configuration"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:42
+msgid "LDAP tree"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:45
+msgid "OGroup RDN"
+msgstr ""
+
+#: plugins/config/class_mainPluginsConfig.inc:45
+msgid "Branch in which object groups will be stored"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:57
+msgid "Configuration"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:58
+#: plugins/config/class_configInLdap.inc:62
+msgid "FusionDirectory configuration"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:65
+msgid "Addons"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:81
+msgid "Look n feel"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:84
+msgid "Language"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:84
+msgid ""
+"Language of the application. If 'automatic' or not available, the one asked "
+"by the browser will be used. This setting can be overriden per user."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
+msgid "Theme"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:89
+msgid "Theme to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
+msgid "Timezone"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:95
+msgid "Timezone to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:102
+msgid "Schema setup"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:105
+msgid "rfc2307bis"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:106
+msgid ""
+"Enables rfc2307bis style groups. You can use member attributes instead of "
+"memberUid in this case."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:111
+msgid "schemaCheck"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:112
+msgid "Enables schema checking during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:119
+#: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
+msgid "Password settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:122
+msgid "Password default hash"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:122
+msgid "Default hash to be used"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:127
+msgid "Force default hash"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:127
+msgid "Force the use of the default password hash"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
+#: setup/setup_config1.tpl.c:50
+msgid "Password minimum length"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:131
+msgid "Minimum length of user passwords"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Password minimum differs"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:136
+msgid "Minimum number of different characters from last password"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "Password hook"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:141
+msgid "External script to handle password settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
+msgid "Use account expiration"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:146
+msgid ""
+"Enables shadow attribute tests during the login to FusionDirectory and "
+"forces password renewal or account locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:150
+msgid "SASL Realm"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:154
+msgid "SASL Exop"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:154
+msgid "Attribute to be stored in the userPassword attribute"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:160
+msgid "Core settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
+msgid "Enable primary group filter"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:164
+msgid ""
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
+msgid "Display summary in listings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:170
+msgid ""
+"Determines whether a status bar will be shown on the bottom of lists, "
+"displaying a short summary of type and number of elements in the list."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:175
+msgid "Edit locking"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:176
+msgid ""
+"Check if a entry currently being edited has been modified outside of "
+"FusionDirectory in the meantime."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
+msgid "Enable Copy & Paste"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:182
+msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:186
+msgid "Enable logging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:187
+msgid "Event logging on FusionDirectory side."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:192
+msgid "LDAP size limit"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:192
+msgid "Defines the number of entries to get from LDAP by default."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
+msgid "Login and session"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+msgid "Login attribute"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:203
+msgid "Which LDAP attribute should be used as the login name during login."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
+msgid "Enforce encrypted connections"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:210
+msgid ""
+"Enables PHP security checks to force encrypted access (https) to the web "
+"interface."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
+msgid "Warn if session is not encrypted"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:215
+msgid "will display a warning to the user when http is used instead of https."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
+msgid "Remember dialog filter settings"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:221
+msgid "Store filter and plugin settings inside of a cookie."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
+msgid "Session lifetime"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:226
+msgid "Defines when a session will expire in seconds."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
+msgid "Snapshots / Undo"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
+#: setup/setup_config2.tpl.c:26
+msgid "Enable snapshots"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:236
+msgid ""
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
+#: setup/setup_config2.tpl.c:29
+msgid "Snapshot base"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:240
+msgid "The base where snapshots should be stored inside of the LDAP."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:244
+msgid "Snapshot server"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:244
+msgid "LDAP URI for the server which is used to do object snapshots."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:248
+msgid "Snapshot user"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:248
+msgid ""
+"The user which is used to authenticate when connecting to snapshot server."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:252
+msgid "Snapshot password"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:252
+msgid ""
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:258
+msgid "Miscellaneous"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:263
+msgid "Hooks that are called when specific actions happens"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:267
+msgid "tab"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:267
+msgid "The tab that this hook concerns"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:272
+msgid "mode"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:272
+msgid "When to call this command"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:278
+msgid "cmd"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:278
+msgid "The command that will be called"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:285
+msgid "Hooks"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:293
+msgid "Available shells"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:293
+msgid "Available POSIX shells for FD users."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
+msgid "People and group storage"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
+msgid "People DN attribute"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:306
+msgid "Attribute to use at the beginning of users dn"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
+msgid "Include personal title in user DN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
+msgid "Customized CN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:316
+msgid "Use a placeholder pattern for generating account cns"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:320
+msgid "Next id hook"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:320
+msgid ""
+"A script to be called for finding the next free id for users or groups "
+"externaly."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
+msgid "Automatic UIDs"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:324
+msgid "Automatic way to generate new user ids"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:328
+msgid "Strict naming policy"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:329
+msgid "Enables strict checking of uids and group names"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:334
+msgid "GID/UID min id"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:335
+msgid ""
+"The minimum assignable user or group id to avoid security leaks with uid 0 "
+"accounts."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:340
+msgid "Number base for people"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:341
+msgid "Where to start looking for a new free user id."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:346
+msgid "Number base for groups"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:347
+msgid "Where to start looking for a new free group id."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:352
+msgid "Users RDN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:352
+msgid "The branch where user are stored."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:357
+msgid "Groups RDN"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:357
+msgid "The branch where groups are stored."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
+msgid "Debugging"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:367
+msgid "Display errors"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:368
+msgid ""
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
+msgid "Maximum LDAP query time"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:372
+msgid ""
+"Stop LDAP actions if there is no answer within the specified number of "
+"seconds."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
+msgid "Log LDAP statistics"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:378
+msgid ""
+"Track LDAP timing statistics to the syslog. This may help to find indexing "
+"problems or bad search filters."
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
+msgid "Debug level"
+msgstr ""
+
+#: plugins/config/class_configInLdap.inc:384
+msgid "Display certain information on each page load."
+msgstr ""
+
+#: plugins/config/class_pluginsConfigInLdap.inc:29
+msgid "Plugins"
+msgstr ""
+
+#: plugins/config/class_pluginsConfigInLdap.inc:30
+msgid "Configuration for plugins"
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:111
+msgid "You need to specify your current password in order to proceed."
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:115
+msgid "The password you've entered as 'New password' is empty."
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:117
+msgid "The password used as new and current are too similar."
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:119
+msgid "The password used as new is to short."
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:136
+#: plugins/admin/users/class_userManagement.inc:346
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:158
+msgid ""
+"The password you've entered as your current password doesn't match the real "
+"one."
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:164
+msgid "You have no permission to change your password."
+msgstr ""
+
+#: plugins/personal/password/class_password.inc:201
+msgid "Change user password"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:142
+msgid "Generic user settings"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:146
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
+#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
+msgid "User"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "اطلاعات شخصی"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr "فامیل"
+
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "نام"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
+msgstr "عنوان شخصی"
+
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
+msgstr "جنسیت"
+
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:193
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:95
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
+#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
+#: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapShotDialog.inc:230
+#: plugins/generic/references/contents.tpl.c:5
+#: plugins/admin/departments/dcObject.tpl.c:11
+#: plugins/admin/departments/locality.tpl.c:11
+#: plugins/admin/departments/country.tpl.c:11
+#: plugins/admin/departments/organization.tpl.c:11
+#: plugins/admin/departments/generic.tpl.c:11
+#: plugins/admin/departments/domain.tpl.c:11
+#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
+#: plugins/admin/ogroups/generic.tpl.c:8
+msgid "Description"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/organization.tpl.c:29
+#: plugins/admin/departments/organization.tpl.c:38
+#: plugins/admin/departments/generic.tpl.c:29
+#: plugins/admin/departments/generic.tpl.c:38
+msgid "Location"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "آدرس"
+
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "شماره اتاق."
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "شماره اتاق"
+
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "تلفن همراه"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "پیجر"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "اطلاعات سازمان"
+
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "شماره دپارتمان."
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "شماره دپارتمان"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "شماره کارمندی."
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "شماره کارمندی"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "آدرس پستی منزل"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "شماره تماس خصوصی"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr "شماره تلفن منزل"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:82
+msgid "Home directory"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:82
+msgid "The path to the home directory of this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:87
+msgid "Shell"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:87
+msgid "Which shell should be used when this user log in"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:91
+msgid "Primary group"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:91
+msgid "Primary group for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:95
+msgid "Status"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:95
+msgid "Status of this user unix account"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:99
+msgid "Force UID/GID"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:99
+msgid "Force UID and GID values for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
+msgid "UID"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:103
+msgid "UID value for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
+#: plugins/admin/groups/class_group.inc:1076
+#: plugins/admin/groups/class_group.inc:1079
+#: plugins/admin/groups/class_group.inc:1120
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:108
+msgid "GID value for this user"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:122
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:126
+msgid "User must change password on first login"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:126
+msgid "User must change password on first login (leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+msgid "Delay before locking password (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+msgid ""
+"The user won't be able to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:135
+msgid "Delay before forcing password change (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:135
+msgid ""
+"The user will be forced to change his password after this number of days "
+"(leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:140
+msgid "Password expiration date"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:140
+msgid ""
+"Date after which this user password will expire (leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:145
+msgid "Delay of inactivity before disabling user (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:145
+msgid ""
+"Maximum delay of inactivity after password expiration before the user is "
+"disabled (leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:150
+msgid "Delay for user warning before password expiry (days)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:150
+msgid ""
+"The user will be warned this number of days before his password expiration "
+"(leave empty to disable)"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/generic.tpl.c:17
+msgid "System trust"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:166
+#: plugins/admin/groups/generic.tpl.c:38
+#: plugins/admin/ogroups/generic.tpl.c:20
+msgid "Trust mode"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:166
+msgid "Type of authorization for those hosts"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:392
+msgid "disabled"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:392
+msgid "full access"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:393
+msgid "allow access to these hosts"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:173
+msgid "Only allow this user to connect to this list of hosts"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:184
+msgid "Unix"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:185
+msgid "Edit users POSIX settings"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
+msgid "unconfigured"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:273
+msgid "automatic"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:291
+msgid "expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:293
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
+msgid "active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:296
+msgid "password expired"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:298
+msgid "password not changeable"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:417
+msgid "Timeout while waiting for lock. Ignoring lock!"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:35
+msgid "Password recovery"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:36
+msgid "Settings for the password recovery feature"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:54
+msgid "Password recovery settings"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:57
+msgid "Activate password recovery"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:58
+msgid "Weither to activate or not password recovery feature"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:63
+msgid "Sender email address"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:64
+msgid "Email address from which mails will be sent"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:70
+msgid "Link validity (minutes)"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:71
+msgid "Number of minutes before a recovery link expires"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:77
+msgid "Salt for tokens"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:78
+msgid ""
+"Just a security measure, you can put anything in there, even random "
+"characters"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:84
+msgid "Allow the use of alternate addresses"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:85
+msgid ""
+"Users will also be able to enter one of theirs alternate addresses to "
+"recover their password"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:92
+msgid "First email"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:95
+#: plugins/admin/password/class_recoveryConfig.inc:114
+msgid "Subject"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:96
+msgid "Subject of the first email"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:99
+msgid "[FusionDirectory] Password recovery link"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:102
+#, php-format
+msgid "Body (first %s is login, second is link)"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:103
+#, php-format
+msgid ""
+"Body of the first email, sent when the user ask for a new password. Use %s "
+"for the login and the recovery link."
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:106
+#, php-format
+msgid ""
+"Hello,\n"
+"\n"
+"Here are your informations : \n"
+" - Login : %s\n"
+" - Link : %s\n"
+"\n"
+"This link is only valid for 10 minutes."
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:111
+msgid "Second email"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:115
+msgid "Subject of the second email"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:118
+msgid "[FusionDirectory] Password recovery successful"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:121
+#, php-format
+msgid "Body (%s is login)"
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:122
+#, php-format
+msgid ""
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
+msgstr ""
+
+#: plugins/admin/password/class_recoveryConfig.inc:125
+#, php-format
+msgid ""
+"Hello,\n"
+"\n"
+"Your password has been changed.\n"
+"Your login is still %s."
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:125
+msgid "Organization name"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
+#: plugins/admin/departments/organization.tpl.c:17
+#: plugins/admin/departments/generic.tpl.c:17
+msgid "Category"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:134
+msgid "Postal address"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr ""
+
+#: plugins/admin/departments/class_dcObject.inc:82
+#: plugins/admin/departments/class_dcObject.inc:83
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
+msgid "Domain Component"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:401
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: ihtml/themes/default/snapshotdialog.tpl.c:35
+msgid "Object"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:442
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
+#: plugins/admin/departments/class_departmentManagement.inc:36
+msgid "Departments"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:480
+msgid "Department name"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:488
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_domain.inc:82
+#: plugins/admin/departments/class_domain.inc:83
+#: plugins/admin/departments/class_domain.inc:89
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:187
+msgid "Domain"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:31
+#: plugins/admin/departments/dep-list.xml:117
+#: plugins/admin/departments/class_countryGeneric.inc:82
+#: plugins/admin/departments/class_countryGeneric.inc:83
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
+msgid "Country"
+msgstr "کشور"
+
+#: plugins/admin/departments/dep-list.xml:39
+#: plugins/admin/departments/dep-list.xml:124
+#: plugins/admin/departments/class_localityGeneric.inc:83
+#: plugins/admin/departments/class_localityGeneric.inc:84
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
+msgid "Locality"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:87
+#: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
+#: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
+msgid "Actions"
+msgstr ""
+
+#: plugins/admin/departments/dep-list.xml:172
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/groups/group-list.xml:108
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/ogroups/ogroup-list.xml:91
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
+#: include/simpleplugin/simple-list.xml:66
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
+msgid "Edit"
+msgstr ""
+
+#: plugins/admin/departments/class_countryGeneric.inc:93
+#: plugins/admin/departments/country.tpl.c:5
+msgid "Country name"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:37
+msgid "Manage departments"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentManagement.inc:39
+msgid "Administration"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
+#: plugins/admin/users/class_userManagement.inc:494
+#: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
+#: plugins/admin/ogroups/ogroup-list.xml:57
+#: plugins/admin/departments/dcObject.tpl.c:2
+#: plugins/admin/departments/locality.tpl.c:2
+#: plugins/admin/departments/country.tpl.c:2
+#: plugins/admin/departments/organization.tpl.c:2
+#: plugins/admin/departments/generic.tpl.c:2
+#: plugins/admin/departments/domain.tpl.c:2
+msgid "Properties"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
+#: ihtml/themes/default/accountexpired.tpl.c:23
+msgid "Change password"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:141
+msgid "Lock users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:149
+msgid "Unlock users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:160
+msgid "Apply template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:192
+msgid "New user from template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:205
+msgid "Edit user"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:214
+msgid "%{filter:lockLabel(userPassword)}"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:237
+msgid "Remove user"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:53
+msgid "Manage users"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
+#: include/simpleplugin/class_simpleManagement.inc:228
+#: include/simpleplugin/class_simpleManagement.inc:294
+#: include/simpleplugin/class_simpleManagement.inc:338
+#: include/simpleplugin/class_simpleManagement.inc:353
+#: include/simpleplugin/class_simpleManagement.inc:378
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
+msgid "Permission"
+msgstr "جواز"
+
+#: plugins/admin/users/class_userManagement.inc:391
+msgid "You have no permission to change this users password!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
+msgid "none"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/acl/class_aclManagement.inc:101
+#: include/class_management.inc:406
+msgid "Permission error"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:763
+msgid "Account locking"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:764
+#, php-format
+msgid ""
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:837
+msgid "Unlock account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:839
+msgid "Lock account"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:867
+msgid "Generic properties"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:161
+msgid "Cannot find group SID in your configuration!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:413
+msgid "Samba group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:413
+msgid "Domain admins"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:413
+msgid "Domain users"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:414
+msgid "Domain guests"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:419
+#, php-format
+msgid "Special group (%d)"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:524
+#, php-format
+msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:530
+#, php-format
+msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:597
+msgid "! unknown UID"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:640
+#, php-format
+msgid "Search returned too many results. Not displaying more than %s entries!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:867
+#, php-format
+msgid "Cannot find any SID for '%s'!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:872
+#, php-format
+msgid "Cannot find any RIDBASE for '%s'!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:965
+#, php-format
+msgid "The gidNumber '%s' is already in use by %s!"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:1107
+msgid "Generic group settings"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:1122
+msgid "Samba group type"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:1123
+msgid "Samba domain name"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:1125
+msgid "Phone pickup group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:1126
+msgid "Nagios group"
+msgstr ""
+
+#: plugins/admin/groups/class_group.inc:1128
+msgid "Group member"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr ""
+
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
+#: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
+msgid "Select user"
+msgstr ""
+
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
+msgid "ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:76
+msgid "Reset ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
+msgid "One level"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
+msgid "Current object"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
+msgid "Complete subtree"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
+msgid "Complete subtree (permanent)"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
+msgid "Up"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
+msgid "Down"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
+#, php-format
+msgid "Delete"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:362
+msgid "No ACL settings for this category"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:364
+#, php-format
+msgid "ACL for these objects: %s"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:370
+msgid "Edit category ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:374
+msgid "Reset category ACL"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:394
+#, php-format
+msgid "Edit ACL for '%s', scope is '%s'"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
+msgid "All objects in current subtree"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:590
+msgid "Object in use"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:590
+#, php-format
+msgid "This role cannot be removed while it is in use by these objects:"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
+msgid "ACL role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:653
+msgid "Permissions"
+msgstr ""
+
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr ""
+
+#: plugins/admin/acl/acl-list.xml:15
+#: plugins/admin/acl/class_aclManagement.inc:36
+msgid "Acl"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:37
+msgid "Access control list management"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:161
+msgid "ACL Assignment"
+msgstr ""
+
+#: plugins/admin/acl/tabs_acl_role.inc:28
+msgid "ACL Templates"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:36
+#: plugins/admin/ogroups/class_ogroup.inc:900
+msgid "Object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:37
+msgid "Manage object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:119
+msgid "Infrastructure error"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+msgid "Templates"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+msgid "Windows Install"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
+msgid "Devices"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
+msgid "Startup"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
+msgid "Systems"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
+msgid "Workstartup"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
+msgid "Debconf"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
+msgid "FAI"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
+msgid "FAI summary"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
+msgid "Argonaut client"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
+msgid "OPSI"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:209
+#, php-format
+msgid ""
+"These systems are already configured by other object groups and cannot be "
+"added:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:247
+#: ihtml/themes/default/msg_dialog.tpl.c:8
+#: ihtml/themes/default/msg_dialog.tpl.c:26 setup/setup_ldap.tpl.c:62
+msgid "Information"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:247
+msgid "You cannot combine terminals and workstations in one object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:583
+msgid "Non existing dn:"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:761
+msgid "You can combine two different object types at maximum, only!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:896
+msgid "Object group generic"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:910
+msgid "Member"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:79
+msgid "Objectgroup"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+msgid "Send message"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+msgid "Edit object group"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+msgid "Remove object group"
+msgstr ""
+
+#: include/class_tabs.inc:75
+#, php-format
+msgid ""
+"No plugin definitions found to initialize '%s', please check your "
+"configuration file."
+msgstr ""
+
+#: include/class_tabs.inc:291
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr ""
+
+#: include/class_tabs.inc:398
+msgid "References"
+msgstr ""
+
+#: include/class_sortableListing.inc:310
+msgid "Edit this entry"
+msgstr ""
+
+#: include/class_sortableListing.inc:315
+msgid "Delete this entry"
+msgstr ""
+
+#: include/class_xml.inc:66
+msgid "in"
+msgstr ""
+
+#: include/class_xml.inc:68
+msgid "on line"
+msgstr ""
+
+#: include/class_xml.inc:69
+msgid "XML error"
+msgstr ""
+
+#: include/php_setup.inc:36
+msgid "PHP error"
+msgstr ""
+
+#: include/php_setup.inc:43
+msgid "class"
+msgstr ""
+
+#: include/php_setup.inc:49
+msgid "function"
+msgstr ""
+
+#: include/php_setup.inc:54
+msgid "static"
+msgstr ""
+
+#: include/php_setup.inc:58
+msgid "method"
+msgstr ""
+
+#: include/php_setup.inc:101
+msgid "Trace"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "File"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "Line"
+msgstr ""
+
+#: include/php_setup.inc:102
+msgid "Type"
+msgstr ""
+
+#: include/php_setup.inc:103
+msgid "Arguments"
+msgstr ""
+
+#: include/php_setup.inc:207
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+
+#: include/php_setup.inc:212
+msgid "Send bug report to the FusionDirectory Team"
+msgstr ""
+
+#: include/php_setup.inc:213
+msgid "Send bugreport"
+msgstr ""
+
+#: include/php_setup.inc:218
+msgid "Toggle information"
+msgstr ""
+
+#: include/class_session.inc:100 include/class_session.inc:137
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
+msgid "Internal error"
+msgstr "خطای داخلی"
+
+#: include/class_session.inc:100 include/class_session.inc:137
+#: include/class_session.inc:175
+msgid "Requested channel does not exist! Please contact your Administrator."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:162
+#, php-format
+msgid "Show %s"
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:294
+#: include/class_management.inc:487
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_simpleManagement.inc:338
+#: include/simpleplugin/class_simpleManagement.inc:353
+#: include/simpleplugin/class_simpleManagement.inc:378
+#: include/class_management.inc:542 include/class_management.inc:587
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
+#: include/simpleplugin/simple-list.xml:11
+msgid "NO LABEL"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
+#, php-format
+msgid "%s (required)"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:940
+#, php-format
+msgid "An integer between %d and %d"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:942
+#, php-format
+msgid "An integer larger than %d"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
+msgid "An integer smaller than %d"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1027
+#, php-format
+msgid "A float between %f and %f"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1029
+#, php-format
+msgid "A float larger than %f"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
+msgid "A float smaller than %f"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1138
+msgid "Error, incorrect date: "
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
+msgid "Cannot read uploaded file: %s"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1172
+msgid "file is empty"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1175
+msgid "file not found"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1178
+msgid "file not readable"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
+msgid "Upload"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1256
+msgid "Download"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
+msgid "Object base"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
+#, php-format
+msgid "Invalid value for %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
+#: include/class_smbHash.inc:356
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
+msgstr ""
+
+#: include/class_msgPool.inc:43
+#, php-format
+msgid "Select to list objects of type '%s'."
+msgstr ""
+
+#: include/class_msgPool.inc:45
+#, php-format
+msgid "Select to list objects containig '%s'."
+msgstr ""
+
+#: include/class_msgPool.inc:47
+#, php-format
+msgid "Select to list objects that have '%s' enabled"
+msgstr ""
+
+#: include/class_msgPool.inc:49 plugins/admin/ogroups/ogroup_objects.tpl.c:8
+msgid "Select to search within subtrees"
+msgstr ""
+
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:11
+msgid "Search in subtrees"
+msgstr ""
+
+#: include/class_msgPool.inc:67
+msgid "This object will be deleted!"
+msgstr ""
+
+#: include/class_msgPool.inc:69
+#, php-format
+msgid "This '%s' object will be deleted!"
+msgstr ""
+
+#: include/class_msgPool.inc:74
+#, php-format
+msgid "This object will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:76
+#, php-format
+msgid "This '%s' object will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:81
+msgid "This object will be deleted:"
+msgstr ""
+
+#: include/class_msgPool.inc:83
+#, php-format
+msgid "This '%s' object will be deleted:"
+msgstr ""
+
+#: include/class_msgPool.inc:87
+#, php-format
+msgid "These objects will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:89
+#, php-format
+msgid "These '%s' objects will be deleted: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:101
+msgid "You have no permission to delete this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:105 include/class_msgPool.inc:109
+msgid "You have no permission to delete the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:112
+msgid "You have no permission to delete these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:123
+msgid "You have no permission to create this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:127 include/class_msgPool.inc:131
+msgid "You have no permission to create the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:134
+msgid "You have no permission to create these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:145
+msgid "You have no permission to modify this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:149 include/class_msgPool.inc:153
+msgid "You have no permission to modify the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:156
+msgid "You have no permission to modify these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:167
+msgid "You have no permission to view this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:171 include/class_msgPool.inc:175
+msgid "You have no permission to view the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:178
+msgid "You have no permission to view these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:189
+msgid "You have no permission to move this object!"
+msgstr ""
+
+#: include/class_msgPool.inc:193 include/class_msgPool.inc:197
+msgid "You have no permission to move the object:"
+msgstr ""
+
+#: include/class_msgPool.inc:200
+msgid "You have no permission to move these objects:"
+msgstr ""
+
+#: include/class_msgPool.inc:218 include/class_msgPool.inc:238
+#: include/class_msgPool.inc:268
+msgid "Connection information"
+msgstr ""
+
+#: include/class_msgPool.inc:220
+#, php-format
+msgid "Cannot connect to %s database!"
+msgstr ""
+
+#: include/class_msgPool.inc:240
+#, php-format
+msgid "Cannot select %s database!"
+msgstr ""
+
+#: include/class_msgPool.inc:250
+#, php-format
+msgid "No %s server defined!"
+msgstr ""
+
+#: include/class_msgPool.inc:270
+#, php-format
+msgid "Cannot query %s database!"
+msgstr ""
+
+#: include/class_msgPool.inc:280
+#, php-format
+msgid "The field '%s' contains a reserved keyword!"
+msgstr ""
+
+#: include/class_msgPool.inc:292
+#, php-format
+msgid "Command specified as %s hook for plugin '%s' does not exist!"
+msgstr ""
+
+#: include/class_msgPool.inc:308
+#, php-format
+msgid "'%s' command is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:310
+#, php-format
+msgid "'%s' command for plugin %s is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:314
+#, php-format
+msgid "'%s' command (%s) is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:316
+#, php-format
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr ""
+
+#: include/class_msgPool.inc:334
+#, php-format
+msgid "Cannot execute '%s' command!"
+msgstr ""
+
+#: include/class_msgPool.inc:336
+#, php-format
+msgid "Cannot execute '%s' command for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:340
+#, php-format
+msgid "Cannot execute '%s' command (%s)!"
+msgstr ""
+
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
+#, php-format
+msgid "Value for '%s' is too large!"
+msgstr ""
+
+#: include/class_msgPool.inc:359
+#, php-format
+msgid "'%s' must be smaller than %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:373
+#, php-format
+msgid "Value for '%s' is too small!"
+msgstr ""
+
+#: include/class_msgPool.inc:375
+#, php-format
+msgid "'%s' must be %d or above!"
+msgstr ""
+
+#: include/class_msgPool.inc:388
+#, php-format
+msgid "'%s' depends on '%s' - please provide both values!"
+msgstr ""
+
+#: include/class_msgPool.inc:398
+#, php-format
+msgid "There is already an entry with this '%s' attribute in the system!"
+msgstr ""
+
+#: include/class_msgPool.inc:408
+#, php-format
+msgid "The required field '%s' is empty!"
+msgstr ""
+
+#: include/class_msgPool.inc:426
+msgid "Example"
+msgstr ""
+
+#: include/class_msgPool.inc:446
+#, php-format
+msgid "The Field '%s' contains invalid characters"
+msgstr ""
+
+#: include/class_msgPool.inc:447
+#, php-format
+msgid "'%s' is not allowed:"
+msgstr ""
+
+#: include/class_msgPool.inc:447
+#, php-format
+msgid "'%s' are not allowed!"
+msgstr ""
+
+#: include/class_msgPool.inc:450
+#, php-format
+msgid "The Field '%s' contains invalid characters!"
+msgstr ""
+
+#: include/class_msgPool.inc:461
+#, php-format
+msgid "Missing %s PHP extension!"
+msgstr ""
+
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
+#: ihtml/themes/default/msg_dialog.tpl.c:35
+#: ihtml/themes/default/msg_dialog.tpl.c:41
+#: ihtml/themes/default/snapshotdialog.tpl.c:23
+#: ihtml/themes/default/snapshotdialog.tpl.c:47
+#: ihtml/themes/default/islocked.tpl.c:14 ihtml/themes/default/acl.tpl.c:59
+#: ihtml/themes/default/acl.tpl.c:65 ihtml/themes/default/remove.tpl.c:11
+#: ihtml/themes/default/copyPasteDialog.tpl.c:17 setup/setup_ldap.tpl.c:11
+#: setup/setup_migrate.tpl.c:47 setup/setup_migrate.tpl.c:74
+#: setup/setup_migrate.tpl.c:101 setup/setup_migrate.tpl.c:131
+#: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
+#: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
+#: setup/setup_migrate.tpl.c:275
+msgid "Cancel"
+msgstr ""
+
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
+#: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
+#: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
+#: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
+#: setup/setup_migrate.tpl.c:98 setup/setup_migrate.tpl.c:128
+#: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
+#: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
+#: setup/setup_migrate.tpl.c:272
+msgid "Apply"
+msgstr ""
+
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
+msgid "Save"
+msgstr ""
+
+#: include/class_msgPool.inc:503
+#, php-format
+msgid "Add %s"
+msgstr ""
+
+#: include/class_msgPool.inc:513
+#, php-format
+msgid "Delete %s"
+msgstr ""
+
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
+#, php-format
+msgid "Set"
+msgstr ""
+
+#: include/class_msgPool.inc:523
+#, php-format
+msgid "Set %s"
+msgstr ""
+
+#: include/class_msgPool.inc:533
+#, php-format
+msgid "Edit..."
+msgstr ""
+
+#: include/class_msgPool.inc:533
+#, php-format
+msgid "Edit %s..."
+msgstr ""
+
+#: include/class_msgPool.inc:541
+msgid "Back"
+msgstr ""
+
+#: include/class_msgPool.inc:570
+#, php-format
+msgid "This account has no valid %s extensions!"
+msgstr ""
+
+#: include/class_msgPool.inc:583
+#, php-format
+msgid ""
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
+#, php-format
+msgid ""
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:611
+#, php-format
+msgid ""
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
+#, php-format
+msgid ""
+"This account has %s settings disabled. To enable them, you'll need to add "
+"the %s settings first!"
+msgstr ""
+
+#: include/class_msgPool.inc:636
+#, php-format
+msgid "Add %s settings"
+msgstr ""
+
+#: include/class_msgPool.inc:647
+#, php-format
+msgid "Remove %s settings"
+msgstr ""
+
+#: include/class_msgPool.inc:655
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
+#: include/class_msgPool.inc:663
+msgid "January"
+msgstr ""
+
+#: include/class_msgPool.inc:663
+msgid "February"
+msgstr ""
+
+#: include/class_msgPool.inc:663
+msgid "March"
+msgstr ""
+
+#: include/class_msgPool.inc:663
+msgid "April"
+msgstr ""
+
+#: include/class_msgPool.inc:664
+msgid "May"
+msgstr ""
+
+#: include/class_msgPool.inc:664
+msgid "June"
+msgstr ""
+
+#: include/class_msgPool.inc:664
+msgid "July"
+msgstr ""
+
+#: include/class_msgPool.inc:664
+msgid "August"
+msgstr ""
+
+#: include/class_msgPool.inc:664
+msgid "September"
+msgstr ""
+
+#: include/class_msgPool.inc:665
+msgid "October"
+msgstr ""
+
+#: include/class_msgPool.inc:665
+msgid "November"
+msgstr ""
+
+#: include/class_msgPool.inc:665
+msgid "December"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Sunday"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Monday"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Tuesday"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Wednesday"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Thursday"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Friday"
+msgstr ""
+
+#: include/class_msgPool.inc:674
+msgid "Saturday"
+msgstr ""
+
+#: include/class_msgPool.inc:687
+msgid "Database operation failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:705
+msgid "read operation"
+msgstr ""
+
+#: include/class_msgPool.inc:705
+msgid "add operation"
+msgstr ""
+
+#: include/class_msgPool.inc:705
+msgid "modify operation"
+msgstr ""
+
+#: include/class_msgPool.inc:706
+msgid "delete operation"
+msgstr ""
+
+#: include/class_msgPool.inc:706
+msgid "search operation"
+msgstr ""
+
+#: include/class_msgPool.inc:706
+msgid "authentication"
+msgstr ""
+
+#: include/class_msgPool.inc:709
+#, php-format
+msgid "LDAP %s failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:711
+msgid "LDAP operation failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:730
+msgid "Upload failed!"
+msgstr ""
+
+#: include/class_msgPool.inc:733
+#, php-format
+msgid "Upload failed: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:744
+msgid "Communication failure with the infrastructure service!"
+msgstr ""
+
+#: include/class_msgPool.inc:746
+#, php-format
+msgid "Communication failure with the infrastructure service: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
+#, php-format
+msgid "This '%s' is still in use by this object: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:765
+#, php-format
+msgid "This '%s' is still in use."
+msgstr ""
+
+#: include/class_msgPool.inc:767
+#, php-format
+msgid "This '%s' is still in use by these objects: %s"
+msgstr ""
+
+#: include/class_msgPool.inc:777
+#, php-format
+msgid "File '%s' does not exist!"
+msgstr ""
+
+#: include/class_msgPool.inc:787
+#, php-format
+msgid "Cannot open file '%s' for reading!"
+msgstr ""
+
+#: include/class_msgPool.inc:797
+#, php-format
+msgid "Cannot open file '%s' for writing!"
+msgstr ""
+
+#: include/class_msgPool.inc:807
+#, php-format
+msgid ""
+"The value for '%s' is currently unconfigured or invalid, please check your "
+"configuration file!"
+msgstr ""
+
+#: include/class_msgPool.inc:817
+#, php-format
+msgid "Cannot delete file '%s'!"
+msgstr ""
+
+#: include/class_msgPool.inc:827
+#, php-format
+msgid "Cannot create folder '%s'!"
+msgstr ""
+
+#: include/class_msgPool.inc:837
+#, php-format
+msgid "Cannot delete folder '%s'!"
+msgstr ""
+
+#: include/class_msgPool.inc:847
+#, php-format
+msgid "Checking for %s support"
+msgstr ""
+
+#: include/class_msgPool.inc:857
+#, php-format
+msgid "Install and activate the %s PHP module."
+msgstr ""
+
+#: include/class_msgPool.inc:867
+#, php-format
+msgid "Install and activate the %s Pear module."
+msgstr ""
+
+#: include/class_msgPool.inc:877
+#, php-format
+msgid ""
+"Cannot initialize class '%s'! Maybe there is a plugin missing in your "
+"FusionDirectory setup?"
+msgstr ""
+
+#: include/class_msgPool.inc:885
+msgid ""
+"The supplied base is not valid and has been reset to the previous value!"
+msgstr ""
+
+#: include/exporter/class_cvsExporter.inc:92
+msgid "CSV"
+msgstr ""
+
+#: include/exporter/class_PDF.php:62
+msgid "Page"
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:58
+msgid "No PDF export possible: there is no FPDF library installed."
+msgstr ""
+
+#: include/exporter/class_pdfExporter.inc:197
+msgid "PDF"
+msgstr ""
+
+#: include/class_management.inc:167
+msgid "Filter error"
+msgstr ""
+
+#: include/class_management.inc:167
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/class_management.inc:653
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
+#: include/class_filter.inc:347 include/functions.inc:2247
+msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+msgstr ""
+
+#: include/class_filter.inc:385 include/functions.inc:1970
+msgid "Apply filter"
+msgstr ""
+
+#: include/class_certificate.inc:86
+msgid "Certificate is empty!"
+msgstr ""
+
+#: include/class_certificate.inc:113
+msgid "Cannot load certificate - only PEM/DER is supported!"
+msgstr ""
+
+#: include/class_certificate.inc:134
+msgid "Cannot extract information for non PEM certificates!"
+msgstr ""
+
+#: include/class_certificate.inc:253
+msgid "No valid certificate loaded!"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:294
+#: ihtml/themes/default/copyPasteDialog.tpl.c:20
+msgid "Cancel all"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
+msgid "Paste"
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:404
+msgid "Cannot paste"
+msgstr ""
+
+#: include/class_config.inc:162
+#, php-format
+msgid "XML error in fusiondirectory.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:335
+msgid "Cannot bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:489
+#, php-format
+msgid "The selected mail method (class %s) is not available"
+msgstr ""
+
+#: include/class_config.inc:653
+msgid "sambaSID and/or sambaRidBase missing in the configuration!"
+msgstr ""
+
+#: include/class_config.inc:1128 include/class_config.inc:1159
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr ""
+
+#: include/class_config.inc:1141
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required compression module "
+"is missing. Please install '%s'."
+msgstr ""
+
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
+msgid "My account"
+msgstr ""
+
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
+msgid "Root"
+msgstr ""
+
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
+msgid "Submit"
+msgstr ""
+
+#: include/password-methods/class_password-methods-sasl.inc:51
+msgid "SASL"
+msgstr ""
+
+#: include/password-methods/class_password-methods-sasl.inc:63
+#, php-format
+msgid "Cannot change password, unknown user '%s'"
+msgstr ""
+
+#: include/password-methods/class_password-methods.inc:320
+msgid "Cannot find a suitable password method for the current hash!"
+msgstr ""
+
+#: include/class_plugin.inc:551
+msgid ""
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr ""
+
+#: include/class_plugin.inc:1657
+msgid "Changing ACL dn"
+msgstr ""
+
+#: include/class_plugin.inc:1657
+msgid "from"
+msgstr ""
+
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
+#, php-format
+msgid "All users"
+msgstr ""
+
+#: include/class_acl.inc:192
+msgid "Reset ACLs"
+msgstr ""
+
+#: include/class_acl.inc:197 include/class_acl.inc:200
+msgid "Use ACL defined in role"
+msgstr ""
+
+#: include/class_acl.inc:516
+msgid "No ACL settings for this category!"
+msgstr ""
+
+#: include/class_acl.inc:518
+#, php-format
+msgid "Contains ACLs for these objects: %s"
+msgstr ""
+
+#: include/class_acl.inc:524 include/class_acl.inc:528
+msgid "category ACL"
+msgstr ""
+
+#: include/class_acl.inc:580
+#, php-format
+msgid "Edit ACL for '%s' - scope is '%s'"
+msgstr ""
+
+#: include/class_acl.inc:765 include/class_acl.inc:772
+msgid "Show/hide advanced settings"
+msgstr ""
+
+#: include/class_acl.inc:789
+msgid "Create objects"
+msgstr ""
+
+#: include/class_acl.inc:790
+msgid "Move objects"
+msgstr ""
+
+#: include/class_acl.inc:791
+msgid "Remove objects"
+msgstr ""
+
+#: include/class_acl.inc:793
+msgid "Grant permission to owner"
+msgstr ""
+
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
+msgid "read"
+msgstr ""
+
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
+msgid "write"
+msgstr ""
+
+#: include/class_acl.inc:802
+msgid "Complete object"
+msgstr ""
+
+#: include/class_acl.inc:968
+#, php-format
+msgid "Unkown ACL type '%s'!"
+msgstr ""
+
+#: include/class_acl.inc:1021
+#, php-format
+msgid "Unknown entry '%s'!"
+msgstr ""
+
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
+#, php-format
+msgid "Role: %s"
+msgstr ""
+
+#: include/class_acl.inc:1095
+msgid "unknown role"
+msgstr ""
+
+#: include/class_acl.inc:1103
+#, php-format
+msgid "Contains settings for these objects: %s"
+msgstr ""
+
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
+msgid "Members"
+msgstr ""
+
+#: include/class_acl.inc:1120
+msgid "inactive"
+msgstr ""
+
+#: include/class_acl.inc:1120
+msgid "No members"
+msgstr ""
+
+#: include/class_acl.inc:1310
+msgid "Manage access control lists"
+msgstr ""
+
+#: include/class_acl.inc:1312
+msgid "ACL roles"
+msgstr ""
+
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
+#: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
+#: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
+#: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
+msgid "Select all"
+msgstr ""
+
+#: include/class_listing.inc:562
+msgid "created by"
+msgstr ""
+
+#: include/class_listing.inc:1106
+msgid "Go to root department"
+msgstr ""
+
+#: include/class_listing.inc:1114
+msgid "Go up one department"
+msgstr ""
+
+#: include/class_listing.inc:1122
+msgid "Go to users department"
+msgstr ""
+
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
+msgid "Home"
+msgstr ""
+
+#: include/class_listing.inc:1129
+msgid "Reload list"
+msgstr ""
+
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
+msgid "Copy"
+msgstr ""
+
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
+msgid "Cut"
+msgstr ""
+
+#: include/class_listing.inc:1550
+msgid "Cut this entry"
+msgstr ""
+
+#: include/class_listing.inc:1560
+msgid "Copy this entry"
+msgstr ""
+
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
+msgid "Restore snapshots"
+msgstr ""
+
+#: include/class_listing.inc:1608
+msgid "Export list"
+msgstr ""
+
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
+msgid "Restore snapshot"
+msgstr ""
+
+#: include/class_listing.inc:1653
+msgid "Create snapshot"
+msgstr ""
+
+#: include/class_listing.inc:1654
+msgid "Create a new snapshot from this object"
+msgstr ""
+
+#: include/class_log.inc:97
+#, php-format
+msgid "Logging failed: %s"
+msgstr ""
+
+#: include/class_log.inc:116
+#, php-format
+msgid "Invalid option '%s' specified!"
+msgstr ""
+
+#: include/class_log.inc:120
+msgid "Specified objectType is empty or invalid!"
+msgstr ""
+
+#: include/class_timezone.inc:60
+#, php-format
+msgid ""
+"The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
+"calculate correct timezone offset."
+msgstr ""
+
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
+msgid "Performance warning"
+msgstr ""
+
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
+#, php-format
+msgid "LDAP performance is poor: last query took about %.2fs!"
+msgstr ""
+
+#: include/class_ldap.inc:862
+#, php-format
+msgid ""
+"Cannot automatically create subtrees with RDN '%s': no object class found!"
+msgstr ""
+
+#: include/class_ldap.inc:898
+#, php-format
+msgid "Cannot automatically create subtrees with RDN '%s': not supported"
+msgstr ""
+
+#: include/class_ldap.inc:1009
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:1011
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr ""
+
+#: include/class_ldap.inc:1071
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1217
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:1228
+#, php-format
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_msg_dialog.inc:167
+msgid "Please fix the above error and reload the page."
+msgstr ""
+
+#: include/class_pluglist.inc:144
+msgid "All objects in this category"
+msgstr ""
+
+#: include/class_pluglist.inc:296
+msgid "The configuration format has changed. Please re-run setup!"
+msgstr ""
+
+#: include/class_databaseManagement.inc:80
+msgid "Please activate debugging for details!"
+msgstr ""
+
+#: include/class_SnapShotDialog.inc:140
+#, php-format
+msgid "You're about to delete the snapshot '%s'."
+msgstr ""
+
+#: include/class_SnapShotDialog.inc:194
+msgid "Remove snapshot"
+msgstr ""
+
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
+msgid "Y-m-d, H:i:s"
+msgstr ""
+
+#: include/functions.inc:124
+#, php-format
+msgid "Fatal error: no class locations defined - please run '%s' to fix this"
+msgstr ""
+
+#: include/functions.inc:138
+#, php-format
+msgid ""
+"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
+msgstr ""
+
+#: include/functions.inc:491
+#, php-format
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
+msgstr ""
+
+#: include/functions.inc:572
+msgid "Username / UID is not unique inside the LDAP tree!"
+msgstr ""
+
+#: include/functions.inc:664
+msgid ""
+"Username / UID is not unique inside the LDAP tree. Please contact your "
+"Administrator."
+msgstr ""
+
+#: include/functions.inc:751 include/functions.inc:871
+msgid "Error while adding a lock. Contact the developers!"
+msgstr ""
+
+#: include/functions.inc:761
+#, php-format
+msgid ""
+"Cannot create locking information in LDAP tree. Please contact your "
+"administrator!"
+msgstr ""
+
+#: include/functions.inc:761
+#, php-format
+msgid "LDAP server returned: %s"
+msgstr ""
+
+#: include/functions.inc:892
+msgid ""
+"Found multiple locks for object to be locked. This should not happen - "
+"cleaning up multiple references."
+msgstr ""
+
+#: include/functions.inc:1210
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr ""
+
+#: include/functions.inc:1212
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+
+#: include/functions.inc:1229
+msgid "Configure"
+msgstr ""
+
+#: include/functions.inc:1234
+msgid "incomplete"
+msgstr ""
+
+#: include/functions.inc:1680
+msgid "Continue anyway"
+msgstr ""
+
+#: include/functions.inc:1682
+msgid "Edit anyway"
+msgstr ""
+
+#: include/functions.inc:1684
+#, php-format
+msgid "You're going to edit the LDAP entry/entries %s"
+msgstr ""
+
+#: include/functions.inc:1939
+msgid "Entries per page"
+msgstr ""
+
+#: include/functions.inc:2384
+#, php-format
+msgid ""
+"File '%s' could not be deleted. Try fusiondirectory-setup --check-"
+"directories to fix permissions."
+msgstr ""
+
+#: include/functions.inc:2426
+msgid "Cannot write to revision file!"
+msgstr ""
+
+#: include/functions.inc:2455
+msgid "Cannot read to revision file!"
+msgstr ""
+
+#: include/functions.inc:2670
+msgid "'baseIdHook' is not available. Using default base!"
+msgstr ""
+
+#: include/functions.inc:2705
+msgid "LDAP warning"
+msgstr ""
+
+#: include/functions.inc:2705
+msgid "Cannot get schema information from server. No schema check possible!"
+msgstr ""
+
+#: include/functions.inc:2732
+msgid "Used to store account specific informations."
+msgstr ""
+
+#: include/functions.inc:2739
+msgid ""
+"Used to lock currently edited entries to avoid multiple changes at the same "
+"time."
+msgstr ""
+
+#: include/functions.inc:2764
+#, php-format
+msgid "Missing required object class '%s'!"
+msgstr ""
+
+#: include/functions.inc:2767
+#, php-format
+msgid "Missing optional object class '%s'!"
+msgstr ""
+
+#: include/functions.inc:2771
+#, php-format
+msgid "Version mismatch for required object class '%s' (!=%s)!"
+msgstr ""
+
+#: include/functions.inc:2774
+#, php-format
+msgid "Class(es) available"
+msgstr ""
+
+#: include/functions.inc:2796
+msgid ""
+"You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
+"schema    configuration do not support this option."
+msgstr ""
+
+#: include/functions.inc:2797
+msgid ""
+"In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
+"be      AUXILIARY"
+msgstr ""
+
+#: include/functions.inc:2801
+msgid ""
+"Your schema is configured to support the rfc2307bis group, but you have "
+"disabled this option on the 'ldap setup' step."
+msgstr ""
+
+#: include/functions.inc:2802
+msgid "The objectClass 'posixGroup' must be STRUCTURAL"
+msgstr ""
+
+#: include/functions.inc:3058
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
+msgid "Cannot allocate a free ID:"
+msgstr ""
+
+#: include/functions.inc:3400
+msgid "unknown idAllocation method!"
+msgstr ""
+
+#: include/functions.inc:3421
+#, php-format
+msgid "%sPoolMin >= %sPoolMax!"
+msgstr ""
+
+#: include/functions.inc:3451
+msgid "Cannot create sambaUnixIdPool entry!"
+msgstr ""
+
+#: include/functions.inc:3459
+msgid "sambaUnixIdPool is not unique!"
+msgstr ""
+
+#: include/functions.inc:3471 include/functions.inc:3475
+msgid "no ID available!"
+msgstr ""
+
+#: include/functions.inc:3491
+msgid "maximum tries exceeded!"
+msgstr ""
+
+#: include/functions.inc:3559
+msgid "Cannot allocate a free ID!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl.c:2
+msgid "Your FusionDirectory session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl.c:5
+msgid ""
+"The last interaction with the FusionDirectory web interface has been some "
+"time ago in the past. For security reasons, the session has been closed. To "
+"continue with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl.c:8
+msgid "Sign in again"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:2
+msgid "Login screen"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:5
+msgid ""
+"Please use your username and your password to log into the site "
+"administration system."
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
+#: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
+#: ihtml/themes/default/password.tpl.c:32
+#: ihtml/themes/default/password.tpl.c:35
+msgid "Username"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:26
+msgid "I forgot my password"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:29 ihtml/themes/default/login.tpl.c:32
+#: ihtml/themes/default/login.tpl.c:35 ihtml/themes/default/recovery.tpl.c:32
+#: ihtml/themes/default/recovery.tpl.c:35
+#: ihtml/themes/default/recovery.tpl.c:77
+#: ihtml/themes/default/recovery.tpl.c:80
+#: ihtml/themes/default/password.tpl.c:26
+#: ihtml/themes/default/password.tpl.c:29
+msgid "Directory"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:38 ihtml/themes/default/login.tpl.c:44
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/default/login.tpl.c:41
+msgid "Click here to log in"
+msgstr ""
+
+#: ihtml/themes/default/simple-filter.tpl.c:2
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
+#: plugins/admin/departments/dep-filter.tpl.c:2
+#: plugins/admin/users/user-filter.tpl.c:2
+#: plugins/admin/groups/group-filter.tpl.c:2
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:2
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:2
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:2
+#: plugins/admin/acl/acl-filter.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
+msgid "Filter"
+msgstr ""
+
+#: ihtml/themes/default/conflict.tpl.c:2
+msgid "Session conflict detected"
+msgstr ""
+
+#: ihtml/themes/default/conflict.tpl.c:8
+msgid ""
+"Probably there's another active instance of your session. Multiple window "
+"operation is technical not possible and heavily depends on the browser "
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr ""
+
+#: ihtml/themes/default/conflict.tpl.c:11
+msgid ""
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr ""
+
+#: ihtml/themes/default/conflict.tpl.c:14
+msgid "Logout"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:2
+msgid "FusionDirectory password recovery"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:11
+msgid "Lost password"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:14
+msgid "Available methods"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:17
+msgid "Receive by email a link that allows you to reset your password"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:20
+msgid "Send"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:23
+msgid "Click here to send a reset link"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:26
+msgid ""
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:29
+msgid ""
+"This dialog provides a simple way to change your password. Enter the new "
+"password (twice) in the fields below and press the 'Change' button."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:47
+#: ihtml/themes/default/recovery.tpl.c:50
+#: ihtml/themes/default/password.tpl.c:50
+#: ihtml/themes/default/password.tpl.c:53
+msgid "New password repeated"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:53
+#: ihtml/themes/default/password.tpl.c:56
+#: plugins/personal/password/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:17
+#: plugins/personal/generic/password.tpl.c:38
+msgid "Password strength"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:56
+#: ihtml/themes/default/recovery.tpl.c:89
+#: ihtml/themes/default/password.tpl.c:59
+msgid "Change"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:59
+#: ihtml/themes/default/recovery.tpl.c:92
+#: ihtml/themes/default/password.tpl.c:62
+#: ihtml/themes/default/accountexpired.tpl.c:26
+msgid "Click here to change your password"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:62
+#: ihtml/themes/default/recovery.tpl.c:65
+#: ihtml/themes/default/password.tpl.c:5 ihtml/themes/default/password.tpl.c:8
+msgid "Success"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:68
+#: ihtml/themes/default/password.tpl.c:11
+msgid "Your password has been changed successfully."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:71
+msgid ""
+"Enter your current e-mail address in the field below and press the 'Change' "
+"button."
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:74
+msgid ""
+"=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
+msgstr ""
+
+#: ihtml/themes/default/recovery.tpl.c:95
+msgid ""
+"Password recovery is not activated. If you have lost your password, please "
+"contact your administrator"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:2
+msgid "Restoring object snapshots"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:5
+msgid ""
+"This procedure will restore a snapshot of the selected object. It will "
+"replace the existing object after pressing the folder icon."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:8
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only necessary to open and save them again (goFon), "
+"but some entries must be recreated manually."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:11
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:17
+msgid "There is no snapshot available that could be restored"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:20
+msgid "Choose a snapshot and click the folder image, to restore the snapshot"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:26
+msgid "Creating object snapshots"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:29
+msgid ""
+"This procedure will create a snapshot of the selected object. It will be "
+"stored inside a special branch of your directory system and can be restored "
+"later on."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:32
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:38
+msgid "Timestamp"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl.c:41
+msgid "Reason for generating this snapshot"
+msgstr ""
+
+#: ihtml/themes/default/simple-remove.tpl.c:5
+#: plugins/admin/ogroups/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 ""
+
+#: ihtml/themes/default/simple-remove.tpl.c:8
+#: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
+#: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
+#: plugins/admin/ogroups/remove.tpl.c:8
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl.c:2
+msgid "Locking conflict detected"
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl.c:8
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
+msgstr ""
+
+#: ihtml/themes/default/islocked.tpl.c:11
+msgid "Read only"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:2
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:5
+msgid "Please choose the way to react for this session"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:8
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+
+#: ihtml/themes/default/sizelimit.tpl.c:11
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
+msgid "Assigned ACL for current entry"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:5 plugins/admin/acl/acl_role.tpl.c:14
+msgid "New ACL"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:17
+msgid "ACL type"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:11 ihtml/themes/default/acl.tpl.c:14
+#: plugins/admin/acl/acl_role.tpl.c:20
+msgid "Select an acl type"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:20
+msgid "Additional filter options"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:23
+msgid "Use members from"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:29
+msgid "Available members"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:32 ihtml/themes/default/acl.tpl.c:35
+msgid "List message possible targets"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:41 ihtml/themes/default/acl.tpl.c:44
+msgid "List message recipients"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:47 plugins/admin/acl/acl_role.tpl.c:23
+msgid "List of available ACL categories"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:50
+msgid "ACL for this object"
+msgstr ""
+
+#: ihtml/themes/default/acl.tpl.c:53
+msgid "Available roles"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:2
+msgid "Main"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:5
+msgid "Sign out"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:8
+msgid "Signed in:"
+msgstr ""
+
+#: ihtml/themes/default/framework.tpl.c:11
+#, c-format
+msgid "Session expires in %d!"
+msgstr ""
+
+#: ihtml/themes/default/remove.tpl.c:5
+msgid ""
+"This may be used by several groups. Please double check if your really want "
+"to do this since there is no way for FusionDirectory to get your data back."
+msgstr ""
+
+#: ihtml/themes/default/logout-close.tpl.c:2
+msgid "Your FusionDirectory session has been closed!"
+msgstr ""
+
+#: ihtml/themes/default/logout-close.tpl.c:5
+msgid ""
+"Please close this browser window and clean the authentication caches to "
+"avoid an automatic re-authentication by your browser."
+msgstr ""
+
+#: ihtml/themes/default/password.tpl.c:2
+msgid "Change your password"
+msgstr ""
+
+#: ihtml/themes/default/password.tpl.c:23
+msgid ""
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
+"'Change' button."
+msgstr ""
+
+#: ihtml/themes/default/password.tpl.c:38
+#: ihtml/themes/default/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:11
+#: plugins/personal/password/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:8
+#: plugins/personal/generic/password.tpl.c:20
+msgid "Current password"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:2
+msgid "Copy & paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:5
+msgid ""
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. FusionDirectory shows the relevant attributes. "
+"Please maintain the values below to fulfill the policies."
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:8
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:11
+msgid ""
+"Or if you copy or cut an entry within FusionDirectory and delete the source "
+"object, you may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl.c:23
+msgid "Operation complete"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl.c:2
+msgid "Your password has expired. Please choose a new one!"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl.c:5
+#: ihtml/themes/default/accountexpired.tpl.c:8
+msgid "Old password"
+msgstr ""
+
+#: ihtml/themes/default/accountexpired.tpl.c:17
+#: ihtml/themes/default/accountexpired.tpl.c:20
+msgid "Verify password"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:2
+msgid "Please choose the LDAP user to be used by FusionDirectory"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:5
+msgid "Search"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:14
+msgid "LDAP connection"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:17
+msgid "Location name"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:20
+msgid "Connection URI"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:23
+msgid "TLS connection"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:29 setup/setup_ldap.tpl.c:32
+#: setup/setup_migrate.tpl.c:95
+msgid "Reload"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:35
+msgid "Authentication"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:38
+msgid "Admin DN"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:47
+msgid "Automatically append LDAP base to admin DN"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:50
+msgid "Admin password"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:53
+msgid "Schema based settings"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:56
+msgid "Use rfc2307bis compliant groups"
+msgstr ""
+
+#: setup/setup_ldap.tpl.c:59
+msgid "Current status"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:2
+msgid "Look and feel"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:17
+msgid "People storage subtree"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:20
+msgid "Group storage subtree"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:26
+msgid "Relaxed naming policies"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:35
+msgid "Number base for people/groups"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:41
+msgid "Password encryption algorithm"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:44
+msgid "Password restrictions"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:53 setup/setup_config1.tpl.c:56
+msgid "Different characters from old password"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:59
+msgid "Password change hook"
+msgstr ""
+
+#: setup/setup_config1.tpl.c:65
+msgid ""
+"FusionDirectory supports several encryption types for your passwords. "
+"Normally this is adjustable via user templates, but you can specify a "
+"default method to be used here, too."
+msgstr ""
+
+#: setup/setup_config1.tpl.c:68
+msgid ""
+"FusionDirectory always acts as admin and manages access rights internally. "
+"This is a workaround till OpenLDAP's in directory ACI's are    fully "
+"implemented. For this to work, we need the admin DN and the corresponding "
+"password."
+msgstr ""
+
+#: setup/setup_config1.tpl.c:71
+msgid ""
+"Some basic LDAP parameters are tunable and affect the locations where "
+"FusionDirectory saves people and groups, including the way accounts get "
+"created. Check the values below if the fit your needs."
+msgstr ""
+
+#: setup/setup_config1.tpl.c:74
+msgid ""
+"FusionDirectory has modular support for several mail methods. These methods "
+"provide interfaces to users mailboxes and general handling    for quotas. "
+"You can choose the dummy plugin to leave all your mail settings untouched."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:2
+msgid ""
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
+"You may want to fix the problems below, in order to provide smooth services."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:5
+msgid "Check again"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:8
+msgid "Add required object classes to the LDAP base"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:11 setup/setup_migrate.tpl.c:86
+#: setup/setup_migrate.tpl.c:140 setup/setup_migrate.tpl.c:167
+#: setup/setup_migrate.tpl.c:194 setup/setup_migrate.tpl.c:224
+#: setup/setup_migrate.tpl.c:254
+msgid "Current"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:14 setup/setup_migrate.tpl.c:89
+#: setup/setup_migrate.tpl.c:143 setup/setup_migrate.tpl.c:170
+#: setup/setup_migrate.tpl.c:197 setup/setup_migrate.tpl.c:227
+#: setup/setup_migrate.tpl.c:257
+msgid "After migration"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:20
+msgid "Close"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:23
+msgid "Move groups into configured group tree"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:26
+msgid ""
+"This dialog allows moving a couple of groups to the configured group tree. "
+"Doing this may straighten your LDAP service."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:29
+msgid ""
+"Be careful with this option! There may be references pointing to these "
+"groups. The FusionDirectory setup can't migrate references, so you may want "
+"to cancel the migration in this case."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:32
+msgid "Move selected groups into this group tree"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:38 setup/setup_migrate.tpl.c:65
+#: setup/setup_migrate.tpl.c:92 setup/setup_migrate.tpl.c:149
+#: setup/setup_migrate.tpl.c:176 setup/setup_migrate.tpl.c:203
+#: setup/setup_migrate.tpl.c:233 setup/setup_migrate.tpl.c:263
+msgid "Hide changes"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:41 setup/setup_migrate.tpl.c:68
+#: setup/setup_migrate.tpl.c:83 setup/setup_migrate.tpl.c:152
+#: setup/setup_migrate.tpl.c:179 setup/setup_migrate.tpl.c:209
+#: setup/setup_migrate.tpl.c:239 setup/setup_migrate.tpl.c:269
+msgid "Show changes"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:50
+msgid "Move users into configured user tree"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:53
+msgid ""
+"This dialog allows moving a couple of users to the configured user tree. "
+"Doing this may straighten your LDAP service."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:56
+msgid ""
+"Be careful with this option! There may be references pointing to these "
+"users. The FusionDirectory setup can't migrate references, so you may want "
+"to cancel the migration in this case."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:59
+msgid "Move selected users into this people tree"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:77
+msgid "Migrate GOsa 2.5 administrative accounts"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:80
+msgid ""
+"This dialog allows the migration of GOsa 2.5 admin accounts into "
+"FusionDirectory 1.0 useable accounts."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:107
+msgid "Abort"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:110
+msgid "Create a new FusionDirectory administrator account"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:113
+msgid ""
+"This dialog will automatically add a new super administrator to your LDAP "
+"tree."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:119
+msgid "User ID"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:125
+msgid "Password (again)"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:134
+msgid ""
+"The listed departments are currently invisible in the FusionDirectory user "
+"interface. If you want to change this for a couple of entries, select them "
+"and use the migrate button below."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
+#: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
+#: setup/setup_migrate.tpl.c:251
+msgid ""
+"If you want to know what will be done when migrating the selected entries, "
+"use the 'Show changes' button to see the LDIF."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:161
+msgid ""
+"The listed users are currently invisible in the FusionDirectory user "
+"interface. If you want to change this for a couple of users, just select "
+"them and use the 'Migrate' button below."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:188
+msgid ""
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
+msgid "Refresh"
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:218
+msgid ""
+"The listed services are currently invalid for the FusionDirectory version "
+"you are going to install. If you want to update a couple of service, just "
+"select them and use the 'Migrate' button below."
+msgstr ""
+
+#: setup/setup_migrate.tpl.c:248
+msgid ""
+"The listed menus are currently invisible in the FusionDirectory interface. "
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:2
+msgid "Feedback successfully send"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:5
+msgid "Subscribe to the fusiondirectory-users mailinglist"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:14
+msgid "Mail address"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:17
+msgid "Send feedback to the FusionDirectory project team"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:20
+msgid ""
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:26
+msgid "Did the setup procedure help you to get started?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:35
+msgid "If not, what problems did you encounter"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:38
+msgid "Is this the first time you use FusionDirectory?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:47
+msgid "I use it since"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:50
+msgid "Select the year since when you are using FusionDirectory"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:53
+msgid "What operating system / distribution do you use?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:56
+msgid "What web server do you use?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:59
+msgid "What PHP version do you use?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:62
+msgid "FusionDirectory version"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:65
+msgid "LDAP"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:68
+msgid "What kind of LDAP server(s) do you use?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:71
+msgid "How many objects are in your LDAP?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:74
+msgid "Features"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:77
+msgid "What features of FusionDirectory do you use?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:80
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
+msgstr ""
+
+#: setup/setup_feedback.tpl.c:83
+msgid "Send feedback"
+msgstr ""
+
+#: setup/setup_language.tpl.c:2
+msgid "Please select the preferred language"
+msgstr ""
+
+#: setup/setup_language.tpl.c:5
+msgid ""
+"At this point, you can select the site wide default language. Choosing "
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr ""
+
+#: setup/setup_language.tpl.c:8
+msgid "Please select your preferred language here"
+msgstr ""
+
+#: setup/setup_config2.tpl.c:5
+msgid "Please choose your preferred timezone here"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:2
+msgid "FusionDirectory core settings"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:11
+msgid "Enable edit locking"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:17
+msgid "FusionDirectory logging"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:26
+msgid "Enforce register_globals to be deactivated"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:44
+msgid "Show PHP errors"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
+msgid "Disabled"
+msgstr ""
+
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+msgid "Enabled"
+msgstr ""
+
+#: setup/setup_frame.tpl.c:2
+msgid "FusionDirectory setup wizard"
+msgstr ""
+
+#: setup/setup_frame.tpl.c:5
+msgid "Installation"
+msgstr ""
+
+#: setup/setup_frame.tpl.c:8
+msgid "Setup"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:2
+msgid ""
+"This seems to be the first time you start FusionDirectory - we didn't find "
+"any configuration right now. This simple wizard intends to help you while "
+"setting it up."
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:5
+msgid "What will the wizard do for you?"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:8
+msgid "Create a basic, single site configuration"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:11
+msgid "Tries to find problems within your PHP and LDAP setup"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:14
+msgid "Let you choose from a set of basic and advanced configuration switches"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:17
+msgid "Guided migration of existing LDAP trees"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:20
+msgid "What will the wizard NOT do for you?"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:23
+msgid "Find every possible configuration error"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:26
+msgid "Migrate every possible LDAP setup - create backup dumps!"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:29
+msgid "To continue..."
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:32
+msgid ""
+"For security reasons you need to authenticate for the installation by "
+"creating the file '/tmp/fusiondirectory.auth', containing the current "
+"session ID on the servers local filesystem. This can be done by executing "
+"the following command:"
+msgstr ""
+
+#: setup/setup_welcome.tpl.c:35
+msgid "Click the 'Next' button when you've finished."
+msgstr ""
+
+#: setup/setup_checks.tpl.c:2
+msgid "PHP module and extension checks"
+msgstr ""
+
+#: setup/setup_checks.tpl.c:14 setup/setup_checks.tpl.c:35
+msgid "FusionDirectory will NOT run without fixing this."
+msgstr ""
+
+#: setup/setup_checks.tpl.c:17 setup/setup_checks.tpl.c:38
+msgid "FusionDirectory will run without fixing this."
+msgstr ""
+
+#: setup/setup_checks.tpl.c:20
+msgid "PHP setup configuration"
+msgstr ""
+
+#: setup/setup_checks.tpl.c:23
+msgid "show information"
+msgstr ""
+
+#: setup/setup_schema.tpl.c:2
+msgid "Schema specific settings"
+msgstr ""
+
+#: setup/setup_schema.tpl.c:5
+msgid "Enable schema validation when logging in"
+msgstr ""
+
+#: setup/setup_schema.tpl.c:8
+msgid "Check status"
+msgstr ""
+
+#: setup/setup_schema.tpl.c:11
+msgid "Schema check succeeded"
+msgstr ""
+
+#: setup/setup_schema.tpl.c:14
+msgid "Schema check failed"
+msgstr ""
+
+#: setup/setup_schema.tpl.c:17
+msgid ""
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr ""
+
+#: setup/setup_schema.tpl.c:20
+msgid ""
+"It seems that your ldap database wasn't initialized yet. This might be the "
+"reason why FusionDirectory can't read your schema configuration!"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:2
+msgid "Create your configuration file"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:5
+msgid "Run "
+msgstr ""
+
+#: setup/setup_finish.tpl.c:8
+msgid "to put the correct right on fusiondirectory.conf"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:11
+msgid "Download configuration"
+msgstr ""
+
+#: setup/setup_finish.tpl.c:14
+msgid "Status: "
+msgstr ""
+
+#: plugins/generic/welcome/welcome.tpl.c:2
+msgid "The FusionDirectory team"
+msgstr ""
+
+#: plugins/generic/references/contents.tpl.c:2
+msgid "Object name"
+msgstr ""
+
+#: plugins/generic/references/contents.tpl.c:8
+msgid "Contents"
+msgstr ""
+
+#: plugins/generic/references/contents.tpl.c:11
+msgid "This object has no relationship to other objects."
+msgstr ""
+
+#: plugins/personal/password/changed.tpl.c:2
+#: plugins/personal/generic/changed.tpl.c:2
+msgid ""
+"You've successfully changed your password. Remember to change all programms "
+"configured to use it as well."
+msgstr ""
+
+#: plugins/personal/password/nochange.tpl.c:2
+#: plugins/personal/generic/nochange.tpl.c:2
+msgid "You have no permission to change your password at this time"
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:2
+#: plugins/personal/generic/password.tpl.c:2
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:5
+#: plugins/personal/generic/password.tpl.c:5
+#: plugins/admin/users/password.tpl.c:5
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:8
+msgid "Your Password has expired. Please choose a new password!"
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:17
+#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/generic/password.tpl.c:14
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
+msgid "Repeat new password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
+msgid "Use proposal"
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
+msgid "Manually specify a password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
+msgid "Set password"
+msgstr ""
+
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
+msgid "Clear fields"
+msgstr ""
+
+#: plugins/personal/generic/nochange.tpl.c:5
+msgid "Your password hash method will not be changed!"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:2
+msgid "User settings"
+msgstr "تنظیمات کاربر"
+
+#: plugins/personal/generic/paste_generic.tpl.c:17
+msgid "Clear password"
+msgstr "حذف کلمه عبور"
+
+#: plugins/personal/generic/paste_generic.tpl.c:20
+msgid "Set new password"
+msgstr "ثبت کلمه عبور جدید"
+
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr ""
+
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "عکس کاربر"
+
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
+#: plugins/admin/groups/group-filter.tpl.c:5
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:8
+#: plugins/admin/groups/group-filter.tpl.c:8
+msgid "Show samba groups"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:11
+#: plugins/admin/groups/group-filter.tpl.c:11
+msgid "Show mail groups"
+msgstr ""
+
+#: plugins/admin/departments/dcObject.tpl.c:5
+#: plugins/admin/departments/locality.tpl.c:5
+msgid "Locality name"
+msgstr ""
+
+#: plugins/admin/departments/dcObject.tpl.c:8
+#: plugins/admin/departments/locality.tpl.c:8
+msgid "Name of locality to create"
+msgstr ""
+
+#: plugins/admin/departments/dcObject.tpl.c:14
+#: plugins/admin/departments/locality.tpl.c:14
+#: plugins/admin/departments/country.tpl.c:14
+#: plugins/admin/departments/organization.tpl.c:14
+#: plugins/admin/departments/domain.tpl.c:14
+msgid "Descriptive text for department"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl.c:2
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl.c:5
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/departments/country.tpl.c:8
+msgid "Name of country to create"
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl.c:5
+msgid "You are currently moving/renaming this department."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl.c:8
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl.c:11
+msgid "FusionDirectory can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl.c:14
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:5
+msgid "Name of organization"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:8
+msgid "Name of organization to create"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:20
+#: plugins/admin/departments/generic.tpl.c:20
+msgid "Category for this subtree"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:35
+#: plugins/admin/departments/generic.tpl.c:35
+msgid "State where this subtree is located"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:41
+#: plugins/admin/departments/generic.tpl.c:41
+msgid "Location of this subtree"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:47
+#: plugins/admin/departments/generic.tpl.c:47
+msgid "Postal address of this subtree"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:53
+#: plugins/admin/departments/generic.tpl.c:53
+msgid "Base telephone number of this subtree"
+msgstr ""
+
+#: plugins/admin/departments/organization.tpl.c:59
+#: plugins/admin/departments/generic.tpl.c:59
+msgid "Base facsimile telephone number of this subtree"
+msgstr ""
+
+#: plugins/admin/departments/remove.tpl.c:5
+msgid ""
+"This includes 'all' accounts, systems, etc. in this subtree. Please double "
+"check if your really want to do this since there is no way for "
+"FusionDirectory to get your data back."
+msgstr ""
+
+#: plugins/admin/departments/remove.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 ""
+
+#: plugins/admin/departments/generic.tpl.c:5
+msgid "Name of department"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl.c:8
+msgid "Name of subtree to create"
+msgstr ""
+
+#: plugins/admin/departments/generic.tpl.c:14
+msgid "Descriptive text for   department"
+msgstr ""
+
+#: plugins/admin/departments/domain.tpl.c:5
+msgid "Domain name"
+msgstr ""
+
+#: plugins/admin/departments/domain.tpl.c:8
+msgid "Name of domain to create"
+msgstr ""
+
+#: plugins/admin/users/templatize.tpl.c:2
+msgid "Applying a template"
+msgstr ""
+
+#: plugins/admin/users/templatize.tpl.c:5
+msgid ""
+"Applying a template to several users will replace all user attributes "
+"defined in the template."
+msgstr ""
+
+#: plugins/admin/users/templatize.tpl.c:11
+msgid "No templates available!"
+msgstr ""
+
+#: plugins/admin/users/template.tpl.c:2
+msgid "Creating a new user using templates"
+msgstr ""
+
+#: plugins/admin/users/template.tpl.c:5
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:5
+msgid "Show templates"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:8
+msgid "Show functional users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:11
+msgid "Show POSIX users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:14
+msgid "Show Mail users"
+msgstr ""
+
+#: plugins/admin/users/user-filter.tpl.c:17
+msgid "Show Samba users"
+msgstr ""
+
+#: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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 ""
+
+#: plugins/admin/users/password.tpl.c:2
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
+msgstr ""
+
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
+msgid "Strength"
+msgstr ""
+
+#: plugins/admin/users/password.tpl.c:35
+msgid "Enforce password change on next login."
+msgstr ""
+
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:5
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:8
+msgid "Show users"
+msgstr ""
+
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:8
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:11
+msgid "Show groups"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl.c:2
+msgid "Group settings"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl.c:5
+#: plugins/admin/groups/generic.tpl.c:2
+#: plugins/admin/ogroups/paste_generic.tpl.c:2
+#: plugins/admin/ogroups/generic.tpl.c:2
+msgid "Group name"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl.c:8
+#: plugins/admin/groups/generic.tpl.c:5
+msgid "Posix name of the group"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl.c:11
+#: plugins/admin/groups/generic.tpl.c:17
+msgid "Normally IDs are autogenerated, select to specify manually"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl.c:14
+#: plugins/admin/groups/generic.tpl.c:20
+msgid "Force GID"
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:23
+msgid "Forced ID number"
+msgstr ""
+
+#: plugins/admin/groups/remove.tpl.c:5
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for FusionDirectory to get your data back."
+msgstr ""
+
+#: plugins/admin/groups/trust_machines.tpl.c:2
+#: plugins/admin/ogroups/trust_machines.tpl.c:2
+msgid "Select systems to add"
+msgstr ""
+
+#: plugins/admin/groups/trust_machines.tpl.c:5
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:5
+#: plugins/admin/ogroups/trust_machines.tpl.c:5
+msgid "Filters"
+msgstr ""
+
+#: plugins/admin/groups/trust_machines.tpl.c:8
+#: plugins/admin/ogroups/trust_machines.tpl.c:8
+msgid "Display systems of department"
+msgstr ""
+
+#: plugins/admin/groups/trust_machines.tpl.c:11
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:17
+#: plugins/admin/ogroups/trust_machines.tpl.c:11
+msgid "Choose the department the search will be based on"
+msgstr ""
+
+#: plugins/admin/groups/trust_machines.tpl.c:14
+#: plugins/admin/ogroups/trust_machines.tpl.c:14
+msgid "Display systems matching"
+msgstr ""
+
+#: plugins/admin/groups/trust_machines.tpl.c:17
+#: plugins/admin/ogroups/trust_machines.tpl.c:17
+msgid "Regular expression for matching addresses"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:11
+msgid "Descriptive text for this group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl.c:26
+msgid "Select to create a samba conform group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl.c:29
+msgid "in domain"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl.c:32
+msgid "Members are in a phone pickup group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl.c:35
+msgid "Members are in a nagios group"
+msgstr ""
+
+#: plugins/admin/groups/generic.tpl.c:41
+msgid "Group members"
+msgstr ""
+
+#: plugins/admin/acl/acl-filter.tpl.c:5
+msgid "Show access control lists"
+msgstr ""
+
+#: plugins/admin/acl/acl-filter.tpl.c:8
+msgid "Show roles"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:2
+msgid "Select objects to add"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:14
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:20
+msgid "Display objects matching"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl.c:23
+msgid "Regular expression for matching object names"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:5
+msgid "Show department"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:14
+msgid "Show Applications"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:17
+msgid "Show server"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:20
+msgid "Show workstation"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
+msgid "Show terminal"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:29
+msgid "Show printer"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:32
+msgid "Show phone"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:5
+msgid "user groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:8
+msgid "nested groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:11
+msgid "application groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:14
+msgid "department groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:17
+msgid "server groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:20
+msgid "workstation groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:23
+msgid "windows workstation groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:26
+msgid "terminal groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:29
+msgid "printer groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:32
+msgid "phone groups"
+msgstr ""
+
+#: plugins/admin/ogroups/paste_generic.tpl.c:5
+msgid "Please enter the new object group name"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl.c:5
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl.c:23
+msgid "Member objects"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/fr/fusiondirectory.po b/locale/fr.po
similarity index 63%
rename from locale/fr/fusiondirectory.po
rename to locale/fr.po
index aed919e6eae4608399c0be41578502e1cac45a02..e6b248aa36ef312e2486683000702b800ae70c7d 100644
--- a/locale/fr/fusiondirectory.po
+++ b/locale/fr.po
@@ -1,61 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# gallak <antoine.gallavardin@free.fr>, 2013
-# gallak <antoine.gallavardin@free.fr>, 2012
-# Benoit Mortier <benoit.mortier@opensides.be>, 2005-2011
-# fusiondirectory <contact@fusiondirectory.org>, 2013
-# fusiondirectory <contact@fusiondirectory.org>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-18 08:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/fr/)\n"
-"Language: fr\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr "Paramètres de FusionDirectory 3/3"
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr "Personnaliser certains paramètres essentiels de FusionDirectory"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "Non"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Oui"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Erreur d'installation"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "La durée de la session doit être une valeur numérique !"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "Le temps maximumpour une requête ldap doit être une valeur numérique !"
 
@@ -76,106 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatique"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "Vérification de l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
-msgstr ""
-"Analyse de votre annuaire LDAP pour la compatibilité avec FusionDirectory"
+msgstr "Analyse de votre annuaire LDAP pour la compatibilité avec FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Recherche de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "Inspecter les classes d'objets de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "Vérification des permissions sur l'annuaire LDAP"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Vérification des départements invisibles"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Vérification des utilisateurs invisibles"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Vérification du superadministrateur"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Vérification d'utilisateurs en dehors de la branche people"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Vérification des groupes en dehors de la branche groups"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Vérification pour les uid en double"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Vérification pour les gid en double"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "Recherche de périphériques USB ancien style"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "Vérification des anciens services qui devront être migré."
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "Vérifier pour les menu des applications ancienne mode"
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "La requête LDAP à échoué"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "L'objet racine est probablement manquant."
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -188,57 +178,56 @@ msgstr "L'objet racine est probablement manquant."
 msgid "Warning"
 msgstr "Avertissement"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "J'ai trouvé %s valeur dupliquées pour l'attribut 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "J'ai trouvé %s groupes en dehors de la branche configurée '%s'."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Bouger"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "J'ai trouvé %s utilsateur(s) en dehors de la branche configurée '%s'."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Echec"
 
@@ -246,56 +235,51 @@ msgstr "Echec"
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-"L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
+msgstr "L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr ""
-"J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans ans "
-"FusionDirec."
-
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+msgstr "J'ai trouvé %s utilisateur(s) qui ne seront pas visibles dans ans FusionDirec."
+
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Migrer"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Erreur de migration"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Impossible de migrer le département '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"J'ai trouvé %s département(s) qui ne seront pas visible dans FusionDirectory."
+msgstr "J'ai trouvé %s département(s) qui ne seront pas visible dans FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Compte administratifs de GOsa 2.5 trouvés : %s"
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
-msgstr ""
-"Il n'y a pas d'administrateurs FusionDirectory 1.0 valide dans votre "
-"annuaire LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
+msgstr "Il n'y a pas d'administrateurs FusionDirectory 1.0 valide dans votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -303,239 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Créer"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Groupes"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-"Il n'y a pas d'administrateurs FusionDirectory dans votre annuaire LDAP."
+msgstr "Il n'y a pas d'administrateurs FusionDirectory dans votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Impossible d'ajouter une ACL pour l'utilisateur '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Erreur d'entrée"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Erreur de mot de passe"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
-msgstr ""
-"Le mot de passe entré dans le champ nouveau et celui dans le champ "
-"vérification ne concordent pas !"
+msgstr "Le mot de passe entré dans le champ nouveau et celui dans le champ vérification ne concordent pas !"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "Le nom d'utilisateur est incorrect !"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Erreur"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "Impossible de bouger les utilisateurs vers le département spécifié !"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "Les groupes seront bougés depuis"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "vers"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "Mise à jour des références suivantes aussi"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "Les utilisateurs seront bougés depuis"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"L'objet LDAP racine est manquant. Il est indispensable pour utiliser votre "
-"annuaire LDAP."
+msgstr "L'objet LDAP racine est manquant. Il est indispensable pour utiliser votre annuaire LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Essai de création de l'objet racine"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr "L'objet racine n'a pas pu être crée, vous devrez essayer vous même."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Object class FusionDirectory obligatoire '%s' manquante !"
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Veuillez vérifier votre installation."
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"Impossible de gérer l'objet structural de votre objet racine. S'il vous "
-"plaît essayer de ajouter la classe d'objet '%s' à la main."
+msgstr "Impossible de gérer l'objet structural de votre objet racine. S'il vous plaît essayer de ajouter la classe d'objet '%s' à la main."
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "La copie de '%s' vers '%s' à échoué :"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Il y a %s services qui ont besoin d'être migrés."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "L'ajout de '%s' à l'annuaire LDAP à échoué: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "La mise à jour de '%s' à échoué : %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Il y a %s services qui doivent être migrés."
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Ajouter"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -543,13 +505,10 @@ msgstr "Ajouter"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Supprimer"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Il y a %s menu d'applications qui doivent être migrés."
@@ -572,8 +531,7 @@ msgstr "Vérification de l'installation"
 
 #: setup/class_setupStep_Checks.inc:40
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr ""
-"Vérification de base de la version de PHP et des extensions nécéssaires."
+msgstr "Vérification de base de la version de PHP et des extensions nécéssaires."
 
 #: setup/class_setupStep_Checks.inc:64
 msgid "Checking PHP version"
@@ -590,23 +548,18 @@ msgstr "Veuillez faire la mise à jour vers une version supportée."
 
 #: setup/class_setupStep_Checks.inc:73
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr ""
-"FusionDirectory à besoin de ce module pour dialoguer avec votre annuaire "
-"ldap."
+msgstr "FusionDirectory à besoin de ce module pour dialoguer avec votre annuaire ldap."
 
 #: setup/class_setupStep_Checks.inc:81
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr ""
-"FusionDirectory à besoin de ce module pour afficher l'interface multilingue."
+msgstr "FusionDirectory à besoin de ce module pour afficher l'interface multilingue."
 
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr ""
-"FusionDirectory à besoin de ce module pour dialoguer avec les différents "
-"types de serveurs et de protocoles."
+msgstr "FusionDirectory à besoin de ce module pour dialoguer avec les différents types de serveurs et de protocoles."
 
 #: setup/class_setupStep_Checks.inc:97
 msgid "FusionDirectory requires this module for the samba integration."
@@ -616,14 +569,11 @@ msgstr "FusionDirectory à besoin de ce module pour dialoguer avec Samba."
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr ""
-"FusionDirectory à besoin du module 'mash' ou 'sha1' pour l'utilisation du "
-"cryptage SSHA."
+msgstr "FusionDirectory à besoin du module 'mash' ou 'sha1' pour l'utilisation du cryptage SSHA."
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr ""
-"FusionDirectory à besoin de ce module pour dialoguer avec un serveur IMAP."
+msgstr "FusionDirectory à besoin de ce module pour dialoguer avec un serveur IMAP."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "mbstring"
@@ -631,9 +581,7 @@ msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:121
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr ""
-"FusionDirectory a besoin  de ce module pour gérer les chaînes de caractère "
-"unicode."
+msgstr "FusionDirectory a besoin  de ce module pour gérer les chaînes de caractère unicode."
 
 #: setup/class_setupStep_Checks.inc:128
 msgid "MDB2"
@@ -643,17 +591,13 @@ msgstr "MDB2"
 msgid ""
 "FusionDirectory requires this module to communicate with several supported "
 "databases."
-msgstr ""
-"FusionDirectory à besoin de ce module pour dialoguer avec les bases de "
-"données supportées."
+msgstr "FusionDirectory à besoin de ce module pour dialoguer avec les bases de données supportées."
 
 #: setup/class_setupStep_Checks.inc:134
 msgid ""
 "If you do not want to install MDB2 and won't use databases, remove the "
 "class_databaseManagement.inc file."
-msgstr ""
-"Si vous ne souhaitez pas installer MDB2 et n'avez pas besoin d'utiliser une "
-"base de données, supprimez le fichier class_databaseManagement.inc."
+msgstr "Si vous ne souhaitez pas installer MDB2 et n'avez pas besoin d'utiliser une base de données, supprimez le fichier class_databaseManagement.inc."
 
 #: setup/class_setupStep_Checks.inc:138
 msgid "imagick"
@@ -669,24 +613,18 @@ msgstr "Module de compression"
 
 #: setup/class_setupStep_Checks.inc:155
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr ""
-"FusionDirectory a besoin de ce module pour gérer les copie instantanées."
+msgstr "FusionDirectory a besoin de ce module pour gérer les copie instantanées."
 
 #: setup/class_setupStep_Checks.inc:166
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"register_globals est un mécanisme PHP pour enregistrer toutes les variables "
-"globales afin que les scripts puissent y accéder sans changer la porté des "
-"variables. Cela peut constituer un risque de sécurité."
+msgstr "register_globals est un mécanisme PHP pour enregistrer toutes les variables globales afin que les scripts puissent y accéder sans changer la porté des variables. Cela peut constituer un risque de sécurité."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr ""
-"Recherchez l'option 'register_globals' dans votre php.ini et mettez la à "
-"'Off'."
+msgstr "Recherchez l'option 'register_globals' dans votre php.ini et mettez la à 'Off'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
@@ -696,17 +634,13 @@ msgstr "PHP utilise cette variable pour effacer des anciennes sessions."
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Mettre cette valeur à 1 jour permet d'éviter de perde les cookies et les "
-"sessions avant qu'elles soient réellement expirées."
+msgstr "Mettre cette valeur à 1 jour permet d'éviter de perde les cookies et les sessions avant qu'elles soient réellement expirées."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Cherchez pour 'session.gc_maxlifetime' dans votre php.ini et mettez le à "
-"86400 ou plus haut."
+msgstr "Cherchez pour 'session.gc_maxlifetime' dans votre php.ini et mettez le à 86400 ou plus haut."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -717,39 +651,28 @@ msgstr "Eteint"
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr ""
-"Pour pouvoir utiliser FusionDirectory sans problèmes, la variable session."
-"auto_register doit être à 'Off' dans votre php.ini."
+msgstr "Pour pouvoir utiliser FusionDirectory sans problèmes, la variable session.auto_register doit être à 'Off' dans votre php.ini."
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"Recherchez la variable session.auto_register  et mettez la à 'Off' dans "
-"votre php.ini."
+msgstr "Recherchez la variable session.auto_register  et mettez la à 'Off' dans votre php.ini."
 
 #: setup/class_setupStep_Checks.inc:193
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr ""
-"FusionDirectory a besoin au minimum de 128MB de mémoire. Allouer moins que "
-"128MB causera des erreurs imprévisibles, qui ne seront pas reproductibles ! "
-"Augmentez la mémoire pour les installations plus complexes."
+msgstr "FusionDirectory a besoin au minimum de 128MB de mémoire. Allouer moins que 128MB causera des erreurs imprévisibles, qui ne seront pas reproductibles ! Augmentez la mémoire pour les installations plus complexes."
 
 #: setup/class_setupStep_Checks.inc:194
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr ""
-"Recherchez 'memory_limit' dans votre fichier php.ini votre et mettez le à "
-"'128M' ou plus haut."
+msgstr "Recherchez 'memory_limit' dans votre fichier php.ini votre et mettez le à '128M' ou plus haut."
 
 #: setup/class_setupStep_Checks.inc:201
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Cette option défini la gestion des sorties, mettez cette option à 'Off', "
-"pour améliorer la performance."
+msgstr "Cette option défini la gestion des sorties, mettez cette option à 'Off', pour améliorer la performance."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
@@ -761,18 +684,15 @@ msgstr "Le temps d'exécution doit être au moins de 30 secondes."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
-"'30' ou plus."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à '30' ou plus."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Augmentez la sécurité de votre serveur en mettant l'option expose_php à "
-"'Off'. PHP n'enverra pas d'information a propos du serveur."
+msgstr "Augmentez la sécurité de votre serveur en mettant l'option expose_php à 'Off'. PHP n'enverra pas d'information a propos du serveur."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
@@ -780,16 +700,13 @@ msgstr "Recherchez 'expose_php' dans votre php.ini et mettez le à 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Améliorez la performance de votre serveur en mettant magic_quotes_gpc à "
-"'off'."
+msgstr "Améliorez la performance de votre serveur en mettant magic_quotes_gpc à 'off'."
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
-"mettez la à 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et mettez la à 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -804,10 +721,7 @@ msgstr "Le fichier de configuration ne peut pas être écrit"
 msgid ""
 "FusionDirectory reads its configuration from a file located in (%s/%s). The "
 "setup can write the configuration directly if it is writeable."
-msgstr ""
-"FusionDirectory lit sa configuration d'un fichier situé dans (%s/%s). Le "
-"programme d'installation peut écrire la configuration directement si le "
-"fichier est permet l'écriture."
+msgstr "FusionDirectory lit sa configuration d'un fichier situé dans (%s/%s). Le programme d'installation peut écrire la configuration directement si le fichier est permet l'écriture."
 
 #: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
 msgid "FusionDirectory settings 2/3"
@@ -829,9 +743,7 @@ msgstr "Configuration de la connexion LDAP"
 msgid ""
 "This dialog performs the basic configuration of the LDAP connectivity for "
 "FusionDirectory."
-msgstr ""
-"Cette page permet la configuration de base de l'annuaire LDAP pour "
-"FusionDirectory."
+msgstr "Cette page permet la configuration de base de l'annuaire LDAP pour FusionDirectory."
 
 #: setup/class_setupStep_Ldap.inc:117
 #, php-format
@@ -874,9 +786,7 @@ msgstr "Fini - écrire le fichier de configuration"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"Votre fichier de configuration est lisible par tout le monde. Veuillez "
-"modifier les permissions !"
+msgstr "Votre fichier de configuration est lisible par tout le monde. Veuillez modifier les permissions !"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -888,16 +798,13 @@ msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
-msgstr ""
-"Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le "
-"serveur web puisse lire %s. Vous pouvez exécuter les commandes suivantes "
-"pour réaliser cette opération:"
+msgstr "Après avoir placé le fichier dans le répertoire %s, assurez vous que seul le serveur web puisse lire %s. Vous pouvez exécuter les commandes suivantes pour réaliser cette opération:"
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Terminé"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Suivant"
 
@@ -944,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr "L'option password differ n'est pas une valeur numérique."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
@@ -952,54 +859,45 @@ msgstr "Format de stockage des mots de passe"
 msgid "Error: Password method not available!"
 msgstr "Erreur: Méthode de changement de mot de passe non disponible!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
-msgstr ""
-"Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
-"Abandon."
-
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. Abandon."
+
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-"Le répertoire '%s' spécifié comme répertoire de compilation est "
-"inaccessible !"
+msgstr "Le répertoire '%s' spécifié comme répertoire de compilation est inaccessible !"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"Le mot de passe entrée dans le champ 'Nouveau mot de passe' et celui dans le "
-"champ 'Répéter le nouveau mot de passe' ne concordent pas."
+msgstr "Le mot de passe entrée dans le champ 'Nouveau mot de passe' et celui dans le champ 'Répéter le nouveau mot de passe' ne concordent pas."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -1007,76 +905,69 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
-msgstr ""
-"Le mot de passe contient probablement des caractères Unicode qui sont "
-"problématique"
+msgstr "Le mot de passe contient probablement des caractères Unicode qui sont problématique"
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "La session ne sera pas cryptée."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr "Je n'ai pas trouve le compte %s"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr "J'ai trouvé plusieurs comptes %s"
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr "Adresse de messagerie"
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr "Il n'y a pas de compte qui utilise l'adresse de messagerie %s"
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr "Il n'y a plusieurs comptes qui utilise l'adresse de messagerie %s"
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-"Contactez votre administrateur système, il y a eu un problème avec l'envoi "
-"du message"
+msgstr "Contactez votre administrateur système, il y a eu un problème avec l'envoi du message"
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr "Le token n'est pas valable"
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
-msgstr ""
-"Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
+msgstr "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
-msgstr ""
-"Un problème est survenu avec le serveur de messagerie, le mail de "
-"confirmation n'a pas été envoyé"
+msgstr "Un problème est survenu avec le serveur de messagerie, le mail de confirmation n'a pas été envoyé"
 
 #: html/setup.php:63
 msgid "Smarty"
@@ -1085,225 +976,197 @@ msgstr "Smarty"
 #: html/main.php:136
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr ""
-"Je n'ai pas trouvé '%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/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Configuration de PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr ""
-"FATAL: Register globals est activé. FusionDirectory ne permettra pas aux "
-"utilisateurs de se connecter tant que ceci n'est pas corrigé par un "
-"administrateur."
+msgstr "FATAL: Register globals est activé. FusionDirectory ne permettra pas aux utilisateurs de se connecter tant que ceci n'est pas corrigé par un administrateur."
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Changement de mot de passe"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
-msgstr ""
-"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
+msgstr "Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "Plus de mémoire disponible !"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Extension"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
-msgstr ""
-"Erreur Fatale : Impossible de trouver une définition pour le plugin '%s' ! "
-"('%s' n'est pas un fichier)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
+msgstr "Erreur Fatale : Impossible de trouver une définition pour le plugin '%s' ! ('%s' n'est pas un fichier)!"
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"FATAL: toutes les variables POST non pas été transférées par PHP - Veuillez "
-"avertir votre administrateur !"
+msgstr "FATAL: toutes les variables POST non pas été transférées par PHP - Veuillez avertir votre administrateur !"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "La session n'est pas cryptée !"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"La durée de validité des sessions configurée dans votre fusiondirectory.conf "
-"sera remplacée par celle définie dans votre php.ini."
+msgstr "La durée de validité des sessions configurée dans votre fusiondirectory.conf sera remplacée par celle définie dans votre php.ini."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr ""
-"Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. "
-"Veuillez exécuter fusiondirectory-setup --check-config."
+msgstr "Le fichier de configuration de FusionDirectory %s/%s ne peut être lu. Veuillez exécuter fusiondirectory-setup --check-config."
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Erreur Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "Il y a une problèmes avec la configuration de l'authentification !"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"Impossible de trouver un utilisateur valide pour le système "
-"d'authentification !"
+msgstr "Impossible de trouver un utilisateur valide pour le système d'authentification !"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
-msgstr ""
-"L'information de l'utilisateur n'est pas unique à travers tout les "
-"annuaires !"
+msgstr "L'information de l'utilisateur n'est pas unique à travers tout les annuaires !"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
-msgstr ""
-"Impossible de détecter les information sur les schémas LDAP installés !"
+msgstr "Impossible de détecter les information sur les schémas LDAP installés !"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Votre installation LDAP contient de vieux schémas :"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Le nom d'utilisateur est incorrect !"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Veuillez introduire votre mot de passe !"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr ""
-"Impossible de trouver l'information utilisateur pour l'authentification "
-"htaccess !"
+msgstr "Impossible de trouver l'information utilisateur pour l'authentification htaccess !"
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Votre navigateur à les cookies désactivées. Veuillez activer les cookies et "
-"recharger cette page avant de vous connecter !"
+msgstr "Votre navigateur à les cookies désactivées. Veuillez activer les cookies et recharger cette page avant de vous connecter !"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Information"
+msgstr "Informations sur le cheveux"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
-msgstr ""
+msgstr "Couleur"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:45
 msgid "Color of the hair"
-msgstr ""
+msgstr "Couleur des cheveux"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Sécurité"
+msgstr "Longueur"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
-msgstr ""
+msgstr "Longueur des cheveux"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:65
 msgid "Bicycle"
-msgstr ""
+msgstr "Bicyclette"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:68
 msgid "Brand"
-msgstr ""
+msgstr "Marque"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:69
 msgid "Brand of the bicycle"
-msgstr ""
+msgstr "Marque de la bicyclette"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:75
 msgid "Has a bell"
-msgstr ""
+msgstr "A une sonnette"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:76
 msgid "Does the bicycle have a bell"
-msgstr ""
+msgstr "Est ce que la bicyclette à une sonnette"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Afficher/Cacher l'information"
+msgstr "Informations FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
-#, fuzzy
 msgid "Informations for ftp login"
-msgstr "Configuration des plugins"
+msgstr "Informations pour la session FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Identifiant"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login for FTP"
-msgstr ""
+msgstr "Nom d'utilisateur pour FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1315,35 +1178,41 @@ msgid "Password"
 msgstr "Mot de passe"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Erreur de mot de passe"
+msgstr "Mot de passe pour FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Hôte"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
-msgstr ""
+msgstr "Hôte FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
-msgstr ""
+msgstr "Port FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Extension"
+msgstr "Plugin de démonstration"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Informations personnelles"
+msgstr "Editer des Informations personnelles"
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1351,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Bienvenue %s !"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
-msgstr "Informations"
+msgstr "Générique"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Messagerie"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1401,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Groupes"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Département"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Téléphone"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Applications"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Serveur"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Clients légers"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Groupes d'objets"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1494,515 +1360,461 @@ msgstr "Configuration"
 msgid "FusionDirectory configuration"
 msgstr "Configuration de FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Extensions"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr "Thèmes et apparences"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Langue"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
-msgstr ""
-"Maintenant vous pouvez choisir la langue par défaut. Automatique utilisera "
-"la langue demandée par le navigateur. Ce paramètre peut être configuré par "
-"utilisateur."
+msgstr "Maintenant vous pouvez choisir la langue par défaut. Automatique utilisera la langue demandée par le navigateur. Ce paramètre peut être configuré par utilisateur."
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Thème"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr "Thème à utiliser"
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Fuseau Horaire"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr "Fuseau horaire à utiliser"
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr "Installation des schémas"
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr "rfc2370bis"
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
-msgstr ""
-"Activation du type de groupe \"rfc2307bis\". Vous pouvez utiliser l'attribut "
-"\"member\" à la place de \"memberUid\"."
+msgstr "Activation du type de groupe \"rfc2307bis\". Vous pouvez utiliser l'attribut \"member\" à la place de \"memberUid\"."
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr "Vérification des schémas LDAP"
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr "Activer la validation des schéma lors de la connexion"
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Préférences pour les mots de passe"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr "Méthode de hachage des mots de passe par défaut"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr "Méthode de hachage à utiliser par défaut"
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr "Forcer la méthode de hachage par défaut"
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
-msgstr ""
-"Forcer l'utilisation de la méthode de hachage des mots de passe par défaut "
+msgstr "Forcer l'utilisation de la méthode de hachage des mots de passe par défaut "
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Taille minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr "Longueur minimum des mots de passe utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr "Différence minimum des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr "Nombre de caractères différents par rapport au précédent mot de passe"
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr "Déclencheur suivant le mot de passe"
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr "Script externe appelé pour la gestion des mots de passe"
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Utiliser l'expiration du compte"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
-msgstr ""
-"Activation des tests sur les attributs cachés durant la connexion à "
-"FusionDirectory et renouvellement forcé des mots de passe ou blocage du "
-"compte"
+msgstr "Activation des tests sur les attributs cachés durant la connexion à FusionDirectory et renouvellement forcé des mots de passe ou blocage du compte"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr "Royaume pour la connexion SASL"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr "Opération Extérieur SASL"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attribut à stocker dans l'attribut 'userPassword'"
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr "Paramétrage de base"
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "Activer le filtre sur les groupes primaires"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
-msgstr ""
-"Déterminer quels sont les groupes primaires est très consommateur en temps. "
-"Vous devriez désactivez cette fonctionnalités si le plugin Groupe est lent à "
-"l’exécution"
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
+msgstr "Déterminer quels sont les groupes primaires est très consommateur en temps. Vous devriez désactivez cette fonctionnalités si le plugin Groupe est lent à l’exécution"
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Afficher les sommaires dans les listes"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Détermine si une barre d'état sera affichée en bas de la liste pour indiquer "
-"les nombres et types d'objets affichés"
+msgstr "Détermine si une barre d'état sera affichée en bas de la liste pour indiquer les nombres et types d'objets affichés"
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Honorer les entités administratives"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-"Active la vérification des attributs unitTag lors de l'utilisation des "
-"entitées administratives"
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr "Édition du verrouillage"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
-msgstr ""
-"Vérifie si une entrée en cours d'édition a été modifié par une application "
-"autre que FusionDirectory dans le même temps"
+msgstr "Vérifie si une entrée en cours d'édition a été modifié par une application autre que FusionDirectory dans le même temps"
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Activer le Copier / Coller"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
-msgstr ""
-"Active la fonction copier/coller pour les entrée LDAP gérés par "
-"FusionDirectory"
+msgstr "Active la fonction copier/coller pour les entrée LDAP gérés par FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr "Activer la journalisation"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr "Activer la journalisation coté FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr "nombre maximal d'objet LDAP retournés"
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr "Définit le nombre maximal d'objets LDAP recupérés par défaut"
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "connexion et session"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Attribut de connexion"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
-msgstr ""
-"Attribut LDAP utilisé comme identifiant de connexion lors de la connexion"
+msgstr "Attribut LDAP utilisé comme identifiant de connexion lors de la connexion"
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Force les connexions cryptées"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr ""
-"Activer les vérifications PHP de sécurité pour activer HTTPS lors de l’accès "
-"à l'interface web"
+msgstr "Activer les vérifications PHP de sécurité pour activer HTTPS lors de l’accès à l'interface web"
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Avertir si la session ne sera pas cryptée"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
-msgstr ""
-"Affiche un avertissement pour indiquer l'usage du protocole HTTP au lieu de "
-"HTTPS"
+msgstr "Affiche un avertissement pour indiquer l'usage du protocole HTTP au lieu de HTTPS"
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Se souvenir des paramètres des filtres"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
-msgstr ""
-"Stocker les filtres et les paramètres des plugins à l'intérieur d'un cookie"
+msgstr "Stocker les filtres et les paramètres des plugins à l'intérieur d'un cookie"
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Durée de vie de la session"
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr "Définit la durée d'une session"
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Copie instantanée / Undo"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Activer la copie instantanée"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
-msgstr ""
-"Cela vous permet de sauver certaines entrées et de les restaurer plus tard"
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr "Cela vous permet de sauver certaines entrées et de les restaurer plus tard"
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Base pour les snapshots"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
-msgstr ""
-"Branche LDAP à l'intérieur de laquelle les copies instantanés d'objets "
-"seront stockés"
+msgstr "Branche LDAP à l'intérieur de laquelle les copies instantanés d'objets seront stockés"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr "Serveur contenant les copies instantanés"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr "URI du serveur LDAP contenant les copies instantanées d'objets"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr "compte utilisateur utilisé pour les copies instantanées"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
-msgstr ""
-"Compte utilisateur utilisé pour se connecter sur le serveur de copies "
-"instantanées"
+msgstr "Compte utilisateur utilisé pour se connecter sur le serveur de copies instantanées"
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
-msgstr ""
-"Mot de passe du compte utilisateur utilisé pour les copies instantanées"
+msgstr "Mot de passe du compte utilisateur utilisé pour les copies instantanées"
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
-msgstr ""
-"Mot de passe utilisé avec le compte utilisateur pour les copies instantanées"
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
+msgstr "Mot de passe utilisé avec le compte utilisateur pour les copies instantanées"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr "Déclencheurs appelés en fonction de l’exécution d’actions spécifiques"
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr "Onglets"
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr "Onglet concerné pas ce déclencheur"
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr "Mode"
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr "Quand appeler cette commande"
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr "Commande"
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr "Commande qui sera appelée"
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Connexions"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr "Shells disponibles"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr "Shells POSIX disponibles pour les utilisateurs de FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
-msgstr ""
-"Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
+msgstr "Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "Type d'attribut pour le DN des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attribut à utiliser pour le début du DN utilisateur"
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Inclure le personal title dans le DN de l'utilisateur"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr "CN customisé"
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr "Utilisation d'un modèle pour générer l'attribut CN des comptes"
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr "Déclencheur permettant de déterminer le prochain identifiant numérique"
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
-msgstr ""
-"Script externe à appeler pour trouver le prochain identifiant numérique "
-"libre pour les utilisateurs et les groupes"
+msgstr "Script externe à appeler pour trouver le prochain identifiant numérique libre pour les utilisateurs et les groupes"
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "Uid automatiques"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
-msgstr ""
-"Système automatique pour générer les nouveaux identifiants utilisateurs"
+msgstr "Système automatique pour générer les nouveaux identifiants utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
-msgstr "Règles de de nommage souples"
+msgstr "Règles de de nommage strictes"
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
-msgstr ""
-"Activer la vérification strictes des identifiants des uid et des groupes"
+msgstr "Activer la vérification strictes des identifiants des uid et des groupes"
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr "Identifiants numériques minimum pour les utilisateurs et groupes"
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
-msgstr ""
-"L'identifiant minimum attribuable à un utilisateur ou groupe pour éviter une "
-"faille de sécurité avec des comptes UID à 0  (root)"
+msgstr "L'identifiant minimum attribuable à un utilisateur ou groupe pour éviter une faille de sécurité avec des comptes UID à 0  (root)"
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr "Nombre de départ pour les utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr "Point de départ pour rechercher un identifiant d'utilisateur libre"
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr "Nombre de départ pour les groupes"
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr "Point de départ pour rechercher un identifiant de groupe libre"
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr "Chemin relatif des utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr "Branche où sont stockés les utilisateurs"
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr "Chemin relatif des groupes"
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr "Branche où sont stockés les groupes"
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Deboguage"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr "Afficher les erreurs"
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
-msgstr ""
-"Afficher les erreurs dans la partie haute de l'écran. Cela sera a désactiver "
-"en environnement de production car des mots de passe peuvent être affichés."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
+msgstr "Afficher les erreurs dans la partie haute de l'écran. Cela sera a désactiver en environnement de production car des mots de passe peuvent être affichés."
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Durée maximale d'une requête LDAP"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr ""
-"Arrêter les opérations LDAP si aucunes réponses n'est obtenue dans un délai "
-"spécifié"
+msgstr "Arrêter les opérations LDAP si aucunes réponses n'est obtenue dans un délai spécifié"
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Inscrit les statistique de l'annuaire LDAP dans les journaux systèmes"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
-msgstr ""
-"Stocker les statistiques LDAP via syslog. Cela aide à trouver les problèmes "
-"d'indexation et de mauvais filtres de recherche."
+msgstr "Stocker les statistiques LDAP via syslog. Cela aide à trouver les problèmes d'indexation et de mauvais filtres de recherche."
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Niveau de débogage"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr "Afficher certaines informations sur chaque chargement de page."
 
@@ -2020,8 +1832,7 @@ msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/class_password.inc:115
 msgid "The password you've entered as 'New password' is empty."
-msgstr ""
-"Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
+msgstr "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
 
 #: plugins/personal/password/class_password.inc:117
 msgid "The password used as new and current are too similar."
@@ -2032,420 +1843,296 @@ msgid "The password used as new is to short."
 msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr "il y à eu un problème: %s. Changement du mot de passe annulé !"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
-msgstr ""
-"Le mot de passe entré comme mot de passe actuel ne correspond pas à votre "
-"mot de passe."
+msgstr "Le mot de passe entré comme mot de passe actuel ne correspond pas à votre mot de passe."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Modifier votre mot de passe"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Information générales sur l'utilisateur"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Inconnu"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
-"Veuillez ajouter une adresse IP ou une combinaison réseau/masque de sous "
-"réseau !"
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "féminin"
+#: plugins/personal/generic/class_user.inc:142
+msgid "Generic user settings"
+msgstr "Paramètres par défaut des utilisateurs"
+
+#: plugins/personal/generic/class_user.inc:146
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
+#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
+msgid "User"
+msgstr "Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "masculin"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Informations personnelles"
 
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Impossible de télécharger le fichier !"
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr "Nom de famille"
 
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
-"Le format de stockage sélectionné pour les mots de passe n'est plus "
-"disponible."
 
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Prénom"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
-"Impossible de sauver la photo de l'utilisateur, ur, FusionDirec a besoin que "
-"la librairie rie5-hp5-ima soit installé pour cela."
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
+msgstr "Titre Personnel"
+
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
+msgstr "Titre Universitaire"
+
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Date de naissance"
+
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
+msgstr "Sexe"
+
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
-"Impossible de construire le RDN: pas de + autorisé dans la construction d'un "
-"sous RDN !"
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "Impossible de construire un RDN: l'attribut n'est pas défini !"
+#: plugins/personal/generic/class_user.inc:193
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:95
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
+#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
+#: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapShotDialog.inc:230
+#: plugins/generic/references/contents.tpl.c:5
+#: plugins/admin/departments/dcObject.tpl.c:11
+#: plugins/admin/departments/locality.tpl.c:11
+#: plugins/admin/departments/country.tpl.c:11
+#: plugins/admin/departments/organization.tpl.c:11
+#: plugins/admin/departments/generic.tpl.c:11
+#: plugins/admin/departments/domain.tpl.c:11
+#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
+#: plugins/admin/ogroups/generic.tpl.c:8
+msgid "Description"
+msgstr "Description"
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
-"Imposible de contruire un RDN: les paramètres de l'attribut sont non "
-"valides !"
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
-"Le format de stockage sélectionné nécessite une configuration de base !"
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Nom"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Prénom"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Page d'accueil"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "GSM"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Bip"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Date de naissance"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Unité"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Identifiant du bâtiment"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Travail"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Dernière distribution"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Lieu de résidence"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Description de l'unité"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Zone de sujet"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Fonction"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Visible par tous"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Rue"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Rôle"
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Code postal"
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/organization.tpl.c:29
+#: plugins/admin/departments/organization.tpl.c:38
+#: plugins/admin/departments/generic.tpl.c:29
+#: plugins/admin/departments/generic.tpl.c:38
+msgid "Location"
+msgstr "Lieu"
 
-#: plugins/personal/generic/class_user.inc:1370
-msgid "Generic user settings"
-msgstr "Paramètres par défaut des utilisateurs"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Département"
 
-#: plugins/personal/generic/class_user.inc:1374
-#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
-#: plugins/admin/groups/userSelect/user-list.xml:14
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
-#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
-msgid "User"
-msgstr "Utilisateur"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Adresse"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
-msgstr "Nom de famille"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Information Utilisateur"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "No. de bureau."
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
-msgid "Personal title"
-msgstr "Titre Personnel"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
-msgid "Academic title"
-msgstr "Titre Universitaire"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
-msgid "Sex"
-msgstr "Sexe"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Langue préférée"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Base"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Image de l'utilisateur"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Restriction de connexions"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:272
 #: plugins/admin/departments/class_organizationGeneric.inc:114
 #: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:120
 #: plugins/admin/departments/dep-list.xml:47
 #: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
 msgid "Organization"
 msgstr "Entreprise"
 
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "No. du département."
+
+#: plugins/personal/generic/class_user.inc:280
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
-#: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
-#: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
-#: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
-#: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
-#: plugins/admin/departments/dcObject.tpl.c:11
-#: plugins/admin/departments/locality.tpl.c:11
-#: plugins/admin/departments/country.tpl.c:11
-#: plugins/admin/departments/organization.tpl.c:11
-#: plugins/admin/departments/generic.tpl.c:11
-#: plugins/admin/departments/domain.tpl.c:11
-#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
-#: plugins/admin/ogroups/generic.tpl.c:8
-msgid "Description"
-msgstr "Description"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "No. de l'employé."
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Numéro de l'employé"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Type de l'employé"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
 #: plugins/admin/departments/dcObject.tpl.c:20
 #: plugins/admin/departments/locality.tpl.c:20
 #: plugins/admin/departments/country.tpl.c:20
@@ -2455,371 +2142,328 @@ msgstr "Description"
 msgid "Manager"
 msgstr "Responsable"
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Numéro de l'employé"
-
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Type de l'employé"
-
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Numéro du bureau"
-
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Numéro de téléphone"
-
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Numéro de page"
-
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Numéro de GSM"
-
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Numéro de fax"
-
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Département"
-
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
-#: plugins/admin/departments/organization.tpl.c:29
-#: plugins/admin/departments/organization.tpl.c:38
-#: plugins/admin/departments/generic.tpl.c:29
-#: plugins/admin/departments/generic.tpl.c:38
-msgid "Location"
-msgstr "Lieu"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Adresse postale"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
+#: plugins/personal/generic/class_user.inc:302
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Numéro de téléphone privé"
+
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Méthode d'encodage des mots de passe"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Les entrées sont différentes"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
 msgstr "Veuillez sélectionner les entrées désirées"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Pc Windows"
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "Modifier les propriétés posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Modifier les propriétés de messagerie"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Modifier les propriétés samba"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Modifier les propriétés téléphoniques"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "Menu"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Modifier les propriétes du menu de démarrage"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Environnement"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Modifier les propriétés d'environnement"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Nom"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Répertoire Home"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr "Chemin du répertoire \"home\" de cet utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr "Shell à utiliser lors de la connexion de l’utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Groupe principal"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr "Groupe principal de cet utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Statut"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr "Status du compte unix de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Forcer l'UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr "Forcer les identifiants numérique de l’utilisateur et du groupe"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr "Identifiant numérique de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr "Identifiant numérique du groupe de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Appartenance au groupe"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Compte"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
-msgstr ""
-"L'utilisateur doit changer son mot de passe lors de sa première connexion"
+msgstr "L'utilisateur doit changer son mot de passe lors de sa première connexion"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
-msgstr ""
-"L'utilisateur doit changer son mot de passe lors du premier connexion "
-"(laisser vide pour désactiver la fonctionnalité)"
+msgstr "L'utilisateur doit changer son mot de passe lors du premier connexion (laisser vide pour désactiver la fonctionnalité)"
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr "Délai (en jour) avant de bloquer le mot de passe"
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
-msgstr ""
-"L'utilisateur ne sera pas habilité à changer son mot de passe après ce "
-"nombre de jour (laisser vide pour désactiver)"
+msgstr "L'utilisateur ne sera pas habilité à changer son mot de passe après ce nombre de jour (laisser vide pour désactiver)"
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr "Délai avant de forcer le changement de mot de passe (en jours)"
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
-msgstr ""
-"L'utilisateur sera forcé de changer son mot de passe après ce nombre de jour "
-"(laisser vide pour désactiver)"
+msgstr "L'utilisateur sera forcé de changer son mot de passe après ce nombre de jour (laisser vide pour désactiver)"
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr "Date d'expiration du mot de passe"
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Date après laquelle le mot de passe de l'utilisateur va expiré (laisser vide "
-"pour désactiver)"
+msgstr "Date après laquelle le mot de passe de l'utilisateur va expiré (laisser vide pour désactiver)"
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr "Délai d'inactivité avant de désactiver l'utilisateur (en jours)"
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
-msgstr ""
-"Délai maximum d'inactivité après l'expiration du mot de passe avant que "
-"l'utilisateur soit désactivé (laisser vide pour désactiver)"
+msgstr "Délai maximum d'inactivité après l'expiration du mot de passe avant que l'utilisateur soit désactivé (laisser vide pour désactiver)"
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
-msgstr ""
-"Délai avant d'avertir l'utilisateur de l'expiration de son mot de passe (en "
-"jours)"
+msgstr "Délai avant d'avertir l'utilisateur de l'expiration de son mot de passe (en jours)"
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
-msgstr ""
-"L'utilisateur sera averti de ce nombre de jour restant avant l'expiration de "
-"ce mot de passe (laisser vide pour désactiver)"
+msgstr "L'utilisateur sera averti de ce nombre de jour restant avant l'expiration de ce mot de passe (laisser vide pour désactiver)"
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Système de Confiance"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Mode de confiance"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr "Type d'autorisation pour ces hôtes"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "désactivé"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "accès complet"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Autoriser seulement cet utilisateur à se connecter sur cet hôte"
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr "Unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Editer les paramètres Unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "non configuré"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automatique"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "temps de grâce activé"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "actif"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "mot de passe expiré"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "mot de passe non modifiable"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Le temps d'attente du verrou à été dépassé. J'ignore le verrou !"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Groupe d'utilisateurs"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2865,9 +2509,7 @@ msgstr "Chaine de caractères aléatoires pour les jetons"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr ""
-"Ceci est juste une mesure de sécurité, vous pouvez mettre ce que vous voulez "
-"ici, même des caractères au hasard"
+msgstr "Ceci est juste une mesure de sécurité, vous pouvez mettre ce que vous voulez ici, même des caractères au hasard"
 
 #: plugins/admin/password/class_recoveryConfig.inc:84
 msgid "Allow the use of alternate addresses"
@@ -2877,9 +2519,7 @@ msgstr "Autoriser des adresses de messagerie alternatives"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr ""
-"Les utilisateurs pourront entre une adresse de messagerie alternative pour "
-"récupérer leur mot de passe"
+msgstr "Les utilisateurs pourront entre une adresse de messagerie alternative pour récupérer leur mot de passe"
 
 #: plugins/admin/password/class_recoveryConfig.inc:92
 msgid "First email"
@@ -2901,17 +2541,14 @@ msgstr "[FusionDirectory] lien de reinitialisation du mot de passe"
 #: plugins/admin/password/class_recoveryConfig.inc:102
 #, php-format
 msgid "Body (first %s is login, second is link)"
-msgstr ""
-"Corps du message (le premier %s est l'identifiant, le second est le lien)"
+msgstr "Corps du message (le premier %s est l'identifiant, le second est le lien)"
 
 #: plugins/admin/password/class_recoveryConfig.inc:103
 #, php-format
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
-msgstr ""
-"Corps du premier message, envoyé lorsque l'utilisateur demande un nouveau "
-"mot de passe. Utilisez %s pour l'identifiant et le lien de récupération."
+msgstr "Corps du premier message, envoyé lorsque l'utilisateur demande un nouveau mot de passe. Utilisez %s pour l'identifiant et le lien de récupération."
 
 #: plugins/admin/password/class_recoveryConfig.inc:106
 #, php-format
@@ -2923,15 +2560,7 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr ""
-"Bonjour,\n"
-"\n"
-"Voici vos informations :\n"
-"\n"
-"- Login : %s\n"
-"- Lien : %s\n"
-"\n"
-"Ceci est seulement valide pour 10 minutes"
+msgstr "Bonjour,\n\nVoici vos informations :\n\n- Login : %s\n- Lien : %s\n\nCeci est seulement valide pour 10 minutes"
 
 #: plugins/admin/password/class_recoveryConfig.inc:111
 msgid "Second email"
@@ -2953,11 +2582,9 @@ msgstr "Corps du message (%s est l'identifiant)"
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
-msgstr ""
-"Corps du second message, envoyé pour confirmer le mot de passe a été changé. "
-"Utilisez %s pour l'indentifiant de l'utilisateur."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
+msgstr "Corps du second message, envoyé pour confirmer le mot de passe a été changé. Utilisez %s pour l'indentifiant de l'utilisateur."
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
 #, php-format
@@ -2966,128 +2593,107 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr ""
-"Hello,\n"
-"\n"
-"Votre mot de passe à été changé. \n"
-"Vos identifiants de connexion sont toujours %s."
+msgstr "Hello,\n\nVotre mot de passe à été changé. \nVos identifiants de connexion sont toujours %s."
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Nom de l'entreprise"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Catégorie"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Numéro de téléphone"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Base"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Paramètres administratifs"
+msgid "Postal address"
+msgstr "Adresse postale"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Numéro de téléphone"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "Objet Domaine"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"Impossible de trouver un marqueur libre pour marquer l'entité "
-"administrative !"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Marquer '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Continuer"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Bouger '%s' vers '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Objet"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Impossible de copier %s, arrêt de l'opération"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Continuer"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Départements"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Nom du département"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Adresse"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "L'objet '%s' est déjà marqué"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Ajouter une marque (%s) à l'objet '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Suppression de la marque de l'objet '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Domaine"
 
@@ -3104,8 +2710,8 @@ msgstr "Composant domaine"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Pays"
 
@@ -3113,8 +2719,8 @@ msgstr "Pays"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Lieu"
 
@@ -3122,24 +2728,26 @@ msgstr "Lieu"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Actions"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Editer"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Pays"
@@ -3157,11 +2765,24 @@ msgid "List of users"
 msgstr "Liste des utilisateurs"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Modèle"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Nom"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Prénom"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3173,7 +2794,7 @@ msgstr "Modèle"
 msgid "Properties"
 msgstr "Propriétés"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Modifier le mot de passe"
@@ -3194,15 +2815,15 @@ msgstr "Appliquer le modèle"
 msgid "New user from template"
 msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Editer cet utilisateur"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "Suppression de l'utilisateur"
 
@@ -3210,60 +2831,56 @@ msgstr "Suppression de l'utilisateur"
 msgid "Manage users"
 msgstr "Gérer les utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr "Permissions"
 
 #: plugins/admin/users/class_userManagement.inc:391
 msgid "You have no permission to change this users password!"
-msgstr ""
-"Vous n'avez pas l'autorisation pour changer le mot de passe de ce(s) "
-"utilisateurs !"
+msgstr "Vous n'avez pas l'autorisation pour changer le mot de passe de ce(s) utilisateurs !"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte "
-"(%s) n'a pas été verrouillé !"
+msgstr "La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte (%s) n'a pas été verrouillé !"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Verrouiller Compte"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr "Propriétés de base"
 
@@ -3271,57 +2888,52 @@ msgstr "Propriétés de base"
 msgid "Cannot find group SID in your configuration!"
 msgstr "Impossible de trouver le SID de ce groupe dans votre configuration !"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Administrateurs du domaine"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Invités du domaine"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"L'ajout de l'UID '%s' au groupe '%s' à échoué : Impossible de trouver "
-"l'utilisateur !"
+msgstr "L'ajout de l'UID '%s' au groupe '%s' à échoué : Impossible de trouver l'utilisateur !"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
-msgstr ""
-"L'ajout de l'UID '%s' au groupe '%s' à échoué : l'UID est utilisé plus d'un "
-"fois !"
+msgstr "L'ajout de l'UID '%s' au groupe '%s' à échoué : l'UID est utilisé plus d'un fois !"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "! identifiant inconnu"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
+msgstr "La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Impossible de trouver le SID pour '%s' !"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Impossible de trouver le RIDBASe pour '%s' !"
@@ -3335,23 +2947,23 @@ msgstr "L'identifiant de groupe '%s' est déjà utilisé par '%s' !"
 msgid "Generic group settings"
 msgstr "Préférences des groupes génériques"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Domaine Samba"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Groupe téléphonique"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Groupe Nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Membre du groupe"
 
@@ -3379,118 +2991,159 @@ msgstr "Enlever le groupe"
 msgid "Manage groups"
 msgstr "Gérer les groupes"
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "Modifier les propriétés posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Modifier les propriétés de messagerie"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Modifier les propriétés samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Modifier les propriétés téléphoniques"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "Menu"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Modifier les propriétes du menu de démarrage"
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Environnement"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Modifier les propriétés d'environnement"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Sélectionner un utilisateur"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Contrôle d'accès (ACL)"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "Editer le rôles (ACL)"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Toutes les catégories"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Remise à zéro des ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Un niveau"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Objet actuel"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Sous arbre complet"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Le sous arbre complet (permanent)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Au dessus"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "En bas"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "Pas d'ACL pour cette catégorie"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL pour ces objets: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "Editer les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "Remettre à zéro les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Tout les objets dans le sous arbres actuel"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Objet utilisé"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
+msgstr "Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Rôle"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Contrôle d'accès (ACL)"
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr "Rôles ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -3498,7 +3151,7 @@ msgstr "Permissions"
 msgid "List of acls"
 msgstr "Liste des acls"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "Acl"
@@ -3516,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "Modèles des ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
@@ -3536,59 +3189,68 @@ msgstr "Modèles"
 msgid "Windows Install"
 msgstr "Installation Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Queue téléphonique"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Applications"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Pc Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Périphériques"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Démarrage"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Systèmes"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr "Stations de travail"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr "Debconf"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Sommaire FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr "Client Argonaut"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr "OPSI"
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Queue téléphonique"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Applications"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Ces systèmes sont déjà configurés par d'autres groupes d'objets et ne "
-"peuvent pas être ajoutés :"
+msgstr "Ces systèmes sont déjà configurés par d'autres groupes d'objets et ne peuvent pas être ajoutés :"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3598,9 +3260,7 @@ msgstr "Information"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"Vous ne pouvez pas combiner des terminaux et des stations de travail dans un "
-"groupe d'objet !"
+msgstr "Vous ne pouvez pas combiner des terminaux et des stations de travail dans un groupe d'objet !"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3614,7 +3274,7 @@ msgstr "Vous pouvez combiner au maximum deux objets différents !"
 msgid "Object group generic"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Membres"
 
@@ -3643,40 +3303,34 @@ msgstr "Enlever le groupe d'objet"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"Pas de définition de plugin pour l'initialisation de '%s', veuillez vérifier "
-"votre fichier de configuration."
+msgstr "Pas de définition de plugin pour l'initialisation de '%s', veuillez vérifier votre fichier de configuration."
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "L'effacement à été interrompu par l'extension '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Références"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "Liste triable"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "dans"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "en ligne"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "Erreur XML"
 
@@ -3720,156 +3374,181 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"La création de cette page à occasionné des erreurs d'après l'interpréteur "
-"PHP !"
+msgstr "La création de cette page à occasionné des erreurs d'après l'interpréteur PHP !"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr "Envoyer le rapport de bugs à l'équipe FusionDirectory"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Envoyer un rapport de bug"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Afficher/Cacher l'information"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Erreur interne"
 
 #: include/class_session.inc:100 include/class_session.inc:137
 #: include/class_session.inc:175
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
-"système."
+msgstr "Le canal demandé n'existe pas ! Veuillez contacter votre administrateur système."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Montrer les rôles"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-"Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
+msgstr "Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %s."
 
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Groupe d'utilisateurs"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "Aucun"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
+msgstr "%s (requis)"
 
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
-msgstr ""
+msgstr "Un nombre entier entre %d et %d"
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
-msgstr ""
+msgstr "Un nombre entier plus grande %d"
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "'%s' doit être plus petit que %s !"
+msgstr "Un entier plus petit que %d"
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
-msgstr ""
+msgstr "Un nombre a virgule flottant entre %f et %f"
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
-msgstr ""
+msgstr "Un nombre a virgule flottant plus grand que %f"
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "'%s' doit être plus petit que %s !"
+msgstr "Un nombre a virgule flottant plus petit que %f"
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
-msgstr ""
+msgstr "Erreur, Date incorrecte :"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Impossible de télécharger le fichier !"
+msgstr "Impossible de lire le fichier importé : '%s'"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Le Certificat et vide !"
+msgstr "le fichier est vide."
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "le fichier n'a pas été trouvé"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "le fichier n'est pas lisible"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Recharger"
+msgstr "Télécharger"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "En bas"
+msgstr "Téléchargement"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr "Impossible de sauver la photo de l'utilisateur, ur, FusionDirec a besoin que la librairie rie5-hp5-ima soit installé pour cela."
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nom de l'objet"
+msgstr "Base de l'objet"
 
-#: include/simpleplugin/class_attribute.inc:1976
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
+#, php-format
 msgid "Invalid value for %s"
-msgstr "Identifiant numérique de l'utilisateur"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
 
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
-"Votre installation de PHP ne dispose pas de la fonction mhash(). Les "
-"hachages ne peuvent pas être fait"
 
 #: include/class_msgPool.inc:43
 #, php-format
@@ -3890,7 +3569,7 @@ msgstr "Sélectionnez pour lister les objets qui ont '%s' activés"
 msgid "Select to search within subtrees"
 msgstr "Sélectionner pour chercher dans le sous arbre"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Chercher dans les sous arbre"
@@ -4016,7 +3695,7 @@ msgstr "Pas de serveur %s défini !"
 #: include/class_msgPool.inc:270
 #, php-format
 msgid "Cannot query %s database!"
-msgstr "Impossible d'effectuer une requête sur la base de données %s !"
+msgstr "Impossible d'interroger la base de données %s !"
 
 #: include/class_msgPool.inc:280
 #, php-format
@@ -4026,116 +3705,113 @@ msgstr "Le champ '%s' contient un mot réservé !"
 #: include/class_msgPool.inc:292
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr ""
-"La commande '%s', spécifiée comme connexion de l'extension '%s' n'existe "
-"pas !"
+msgstr "La commande '%s', spécifiée comme connexion de l'extension '%s' n'existe pas !"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "Le commande '%s' est invalide !"
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "l'option '%s' de la commande (%s) pour l'extension %s est invalide !"
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "l'option '%s' de la commande pour l'extension %s est invalide !"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "l'option '%s' de la commande (%s) est invalide !"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "Impossible d'exécuter la commande '%s' !"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "l'option '%s' de la commande (%s) pour l'extension %s est invalide !"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
+msgid "Cannot execute '%s' command!"
+msgstr "Impossible d'exécuter la commande '%s' !"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
-msgstr ""
-"Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
+msgstr "Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Impossible d'exécuter l'option '%s' de la commande (%s) !"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "La valeur pour '%s' est trop grande !"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' doit être plus petit que %s !"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "La valeur pour '%s' est trop petite !"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' doit être à la version %d ou plus grand !"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dépend de '%s' - veuillez indiquer les deux valeurs !"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Il existe déjà une entrée avec l'attribut '%s' dans le système !"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Le champ obligatoire '%s' n'est pas rempli !"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Exemple"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Le champ '%s' contient des caractères invalides"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' n'est pas permis :"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' n'est pas autorisé !"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Le champ '%s' contient des caractères invalides !"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4148,11 +3824,10 @@ msgstr "Extension PHP %s manquante !"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4160,319 +3835,303 @@ msgstr "Annuler"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Appliquer"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
-msgstr "Enregistrer"
+msgstr "Sauver"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Ajouter %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Supprimer %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Activer"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Activer %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Editer..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Editer %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Retour"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Ce compte n'a pas d'extensions %s valides !"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
-"cliquant sur le bouton ci-dessous."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Ce compte possède l'extension %s activée. Vous pouvez la supprimer en cliquant sur le bouton ci-dessous."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Ce compte possède les paramètres %s activés. Pour les désactiver vous devez "
-"au préalable supprimer les paramètres %s !"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Ce compte possède les paramètres %s activés. Pour les désactiver vous devez au préalable supprimer les paramètres %s !"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Ce compte possède les paramètres %s desactivés. Vous pouvez les activer en "
-"cliquant ci dessous."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Ce compte possède les paramètres %s desactivés. Vous pouvez les activer en cliquant ci dessous."
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Ce compte possède les paramètres %s désactivés. Pour les activer, vous devez "
-"au préalable ajouter les paramètres %s !"
+msgstr "Ce compte possède les paramètres %s désactivés. Pour les activer, vous devez au préalable ajouter les paramètres %s !"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "Ajouter les paramètres %s"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "Effacer les paramètres %s"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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"
+msgstr "Cliquez sur le bouton 'Editer' ci-dessous pour changer les informations dans cette boite de dialogue"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Janvier"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Février"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Mars"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Avril"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Mai"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Juin"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Juillet"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Août"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Septembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Octobre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Décembre"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Lundi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Vendredi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Samedi"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr "La requête sur la base de données à échoué !"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "lecture"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "ajout"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "modification"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "suppression"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "recherche"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "authentification"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La requête LDAP %s à échoué !"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "La requête LDAP à échoué !"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "Le téléchargement à échoué !"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Le téléchargement à échoué : %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Erreur de communication avec le service d'infrastructure !"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Erreur de communication avec le service d'infrastructure : %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Ce '%s' est en cours d'utilisation par : %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Ce '%s' est toujours en utilisation."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Ce '%s' est en utilisation par les objets : %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Le fichier '%s' n'existe pas !"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Impossible de lire le fichier '%s' !"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Impossible d'écrire dans le fichier '%s' !"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier "
-"votre fichier de configuration !"
+msgstr "La valeur de '%s' est actuellement vide ou non valide, veuillez vérifier votre fichier de configuration !"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Impossible d'effacer le fichier '%s' !"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Impossible de créer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Impossible d'effacer le répertoire '%s' !"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Vérification du support pour %s"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installer et activer le module PHP %s."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installer et activer le module Pear %s."
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr ""
-"Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
-"extension dans votre installation de FusionDirectory ?"
+msgstr "Impossible d'initialiser la classe '%s' ! Peut être manque t'il une extension dans votre installation de FusionDirectory ?"
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
-msgstr ""
-"La base fournie n'est pas valide et à été réinitialisée à la valeur "
-"précédente !"
+msgstr "La base fournie n'est pas valide et à été réinitialisée à la valeur précédente !"
 
 #: include/exporter/class_cvsExporter.inc:92
 msgid "CSV"
@@ -4490,112 +4149,105 @@ msgstr "Pas d'exportation en pdf, la librairie FPDF n'est pas installée."
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "Erreur de Filtre"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"Pas de déclaration pour '%s' dans votre fichier de configuration. Impossible "
-"d'initialiser le plugin !"
+msgstr "Pas de déclaration pour '%s' dans votre fichier de configuration. Impossible d'initialiser le plugin !"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Le Certificat et vide !"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
-msgstr ""
-"Impossible de charger le certificat - seul les certificats PEM/DER sont "
-"supportés !"
+msgstr "Impossible de charger le certificat - seul les certificats PEM/DER sont supportés !"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr "Impossible d'extraire les informations de certificats non PEM !"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Pas de certificat valide chargé !"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Tout annuler"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Erreur XML dans fusiondirectory.conf: %s à la ligne %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
-"l'administrateur du système."
+msgstr "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter l'administrateur du système."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr "La méthode \"mail\" sélectionnée ( classe %s) n'est pas disponible."
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID et/ou sambaRidBase absents de votre configuration !"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"La fonctionnalité pour les copie instantanées est activée, mais la variable "
-"requise '%s' n'est pas configurée."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "La fonctionnalité pour les copie instantanées est activée, mais la variable requise '%s' n'est pas configurée."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"La fonctionnalité pour les copie instantanées est activée, mais le module "
-"nécessaire à la compression est manquant. Veuillez installer '%s'. "
+msgstr "La fonctionnalité pour les copie instantanées est activée, mais le module nécessaire à la compression est manquant. Veuillez installer '%s'. "
+
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Toutes les catégories"
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1336
 msgid "My account"
-msgstr "Mon Compte"
+msgstr "Mon compte"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -4608,204 +4260,199 @@ msgstr "SASL"
 msgid "Cannot change password, unknown user '%s'"
 msgstr "Impossible de changer le mot de passe, utilisateur '%s' inconnu."
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"Impossible de trouver une méthode de cryptage correspondante pour le mot de "
-"passe !"
+msgstr "Impossible de trouver une méthode de cryptage correspondante pour le mot de passe !"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
-msgstr ""
-"Cet objet à changer depuis son ouverture dans FusionDirectory. Tout les "
-"changement effectués par les autres seront perdus si vous sauvez cette "
-"entrée !"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr "Cet objet à changer depuis son ouverture dans FusionDirectory. Tout les changement effectués par les autres seront perdus si vous sauvez cette entrée !"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "Changement du dn de l'acl"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "de"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "Tout les utilisateurs"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Remise à zéro des ACL"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Utiliser l'ACL définie dans le rôle"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Pas de paramètres pour les ACL de cette catégorie !"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contient les ACL pour ces objets: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "ACL de la catégorie"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Afficher/Cacher la configuration avancée"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Créer un objet"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Bouger un objet"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Enlever les objets"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Donner la permission à l'utilisateur"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "lecture"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "écrire"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "L'objet au complet"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Type d'ACL inconnu '%s' !"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entrée inconnue '%s'  !"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Rôle : %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "Rôle inconnu"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contient les paramètres pour ces objets: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Membres"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "inactif"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "Aucun membres"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Gestion de listes de contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "Rôles ACL"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Sélectionner tout"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "Crée par"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
@@ -4828,334 +4475,288 @@ msgstr "Le type d'objet spécifié est vide ou invalide !"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"Le fuseau horaire '%s' indiqué dans votre fusiondirectory.conf est invalide. "
-"Impossible de calculer le décalage horaire correct."
+msgstr "Le fuseau horaire '%s' indiqué dans votre fusiondirectory.conf est invalide. Impossible de calculer le décalage horaire correct."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Avertissement de performance"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
-msgstr ""
-"La performance de votre annuaire est faible : la dernière requête à duré "
-"%.2fs !"
+msgstr "La performance de votre annuaire est faible : la dernière requête à duré %.2fs !"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Impossible de créer automatiquement des sous arbres avec le RDN '%s': object "
-"class non trouvé !"
+msgstr "Impossible de créer automatiquement des sous arbres avec le RDN '%s': object class non trouvé !"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr ""
-"Impossible de créer automatiquement des sous arbres avec le RDN '%s': non "
-"supporté"
+msgstr "Impossible de créer automatiquement des sous arbres avec le RDN '%s': non supporté"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "Programmes manquants ligne de commande '%s' !"
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
-"avec 'dn: ...' à la ligne %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
-"votre fichier LDIF à partir de la ligne %s !"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier votre fichier LDIF à partir de la ligne %s !"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Tout les objets dans cette catégorie"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
-msgstr ""
-"Le format du fichier de configuration à changé. Veuillez réexecuter "
-"l'installation !"
+msgstr "Le format du fichier de configuration à changé. Veuillez réexecuter l'installation !"
 
 #: include/class_databaseManagement.inc:80
 msgid "Please activate debugging for details!"
 msgstr "Veuillez activer le mode debug pour plus de détail !"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Vous êtes sur le point de supprimer le snapshot '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Supprimer le snapshot"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Erreur fatale : pas d'emplacement défini pour les classes  - veuillez "
-"exécuter '%s' pour régler le problème"
+msgstr "Erreur fatale : pas d'emplacement défini pour les classes  - veuillez exécuter '%s' pour régler le problème"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
-"'%s' pour essayer de régler le problème"
+msgstr "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter '%s' pour essayer de régler le problème"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu "
-"'%s'."
+msgstr "FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
-msgstr ""
-"Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
+msgstr "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP. "
-"Veuillez contacter votre administrateur système."
+msgstr "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP. Veuillez contacter votre administrateur système."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Erreur lors de l'ajout d'un verrou. Contactez les développeurs !"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
-"Veuillez contacter votre administrateur !"
+msgstr "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP à retourné: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Détection de verrou multiple pour un même objet. Ceci ne devrait pas "
-"arriver. Effacement des références multiples."
+msgstr "Détection de verrou multiple pour un même objet. Ceci ne devrait pas arriver. Effacement des références multiples."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "La taille limite de %d entrées est dépassée !"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
-"toujours dépassée"
+msgstr "Mettre la nouvelle limite à %s et me montrer ce message si la limite est toujours dépassée"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Vous êtes sur le point d'éditer l'entrée(s) %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Entrées par page"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr ""
-"Le ficheir '%s' ne peut être supprimé. Essayer de lancer la commande "
-"\"fusiondirectory-setup --check-directories\" sur le serveur FusionDirectory "
-"pour corriger les permissions de fichiers"
+msgstr "Le ficheir '%s' ne peut être supprimé. Essayer de lancer la commande \"fusiondirectory-setup --check-directories\" sur le serveur FusionDirectory pour corriger les permissions de fichiers"
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr "Impossible d'écrire le fichier contenant le numéro de version !"
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' n'est pas disponible. Utilisation de la base par défaut !"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"Impossible de récupérer les informations sur les schémas depuis le serveur. "
-"Vérification des schémas impossibles !"
+msgstr "Impossible de récupérer les informations sur les schémas depuis le serveur. Vérification des schémas impossibles !"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Utilisé pour stocker les informations spécifiques des comptes."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
-"multiples changements simultanés."
+msgstr "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de multiples changements simultanés."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Object class obligatoire '%s' manquante !"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Object class facultative '%s' manquante !"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "La version requise des object class ne correspond pas '%s' (!=%s) !"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Vous avez activé l'option rfc2307bis dans votre option 'configuration du "
-"serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
-"supportent pas cette option."
+msgstr "Vous avez activé l'option rfc2307bis dans votre option 'configuration du serveur ldap' lors de l'installation, mais la configuration de vos schéma ne supportent pas cette option."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
-"l'objectClass 'posixGroup' doit être       AUXILIARY"
+msgstr "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, l'objectClass 'posixGroup' doit être       AUXILIARY"
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Votre schéma est configuré pour supporter les groupes rfc2307, mais vous "
-"avez désactivé cette option lors de l'étape 'configuration de l'annuaire "
-"ldap' du programme d'installation."
+msgstr "Votre schéma est configuré pour supporter les groupes rfc2307, mais vous avez désactivé cette option lors de l'étape 'configuration de l'annuaire ldap' du programme d'installation."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
-"pas."
+msgstr "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe pas."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Impossible d'assigner un ID libre :"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "Méthode d'allocation des id inconnue !"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool n'est pas unique !"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "Pas d' ID disponibles !"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "Nombre maximum d'essais dépassés !"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "Impossible d'assigner un ID libre !"
 
@@ -5168,10 +4769,7 @@ msgid ""
 "The last interaction with the FusionDirectory web interface has been some "
 "time ago in the past. For security reasons, the session has been closed. To "
 "continue with administrative tasks, please sign in again."
-msgstr ""
-"Votre dernière interaction avec FusionDirectory date d'un certain temps. "
-"Pour des raisons de sécurité, la session à été fermée. Pour continuer à "
-"administrer, veuillez vous reconnecter."
+msgstr "Votre dernière interaction avec FusionDirectory date d'un certain temps. Pour des raisons de sécurité, la session à été fermée. Pour continuer à administrer, veuillez vous reconnecter."
 
 #: ihtml/themes/default/logout.tpl.c:8
 msgid "Sign in again"
@@ -5185,9 +4783,7 @@ msgstr "Fenêtre de connexion"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Veuillez utiliser votre nom d'utilisateur et votre mot de passe afin de vous "
-"connecter."
+msgstr "Veuillez utiliser votre nom d'utilisateur et votre mot de passe afin de vous connecter."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5220,7 +4816,6 @@ msgstr "Cliquez ici pour vous connecter"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5230,6 +4825,7 @@ msgstr "Cliquez ici pour vous connecter"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtre"
 
@@ -5241,22 +4837,15 @@ msgstr "Conflit détecté entre différentes sessions"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Une autre instance de votre session a été détectée. Les opérations multiples "
-"sont techniquement impossible et dépendent du navigateur utilisé. L'usage de "
-"navigateurs différents en même temps est possible (ex: IE et Mozilla) est "
-"possible. Cliquer sur le bouton 'Déconnexion' fermera cette session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Une autre instance de votre session a été détectée. Les opérations multiples sont techniquement impossible et dépendent du navigateur utilisé. L'usage de navigateurs différents en même temps est possible (ex: IE et Mozilla) est possible. Cliquer sur le bouton 'Déconnexion' fermera cette session."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Ignorer ce message entraînera la modification/destruction des données en "
-"cours d'édition, il est conseillé de fermer toutes les fenêtres ouvertes et "
-"de se reconnecter."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Ignorer ce message entraînera la modification/destruction des données en cours d'édition, il est conseillé de fermer toutes les fenêtres ouvertes et de se reconnecter."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5276,8 +4865,7 @@ msgstr "Méthodes disponibles"
 
 #: ihtml/themes/default/recovery.tpl.c:17
 msgid "Receive by email a link that allows you to reset your password"
-msgstr ""
-"Recevoir un lien par email qui permettra de réinitialiser votre mot de passe"
+msgstr "Recevoir un lien par email qui permettra de réinitialiser votre mot de passe"
 
 #: ihtml/themes/default/recovery.tpl.c:20
 msgid "Send"
@@ -5285,26 +4873,19 @@ msgstr "Envoyé"
 
 #: ihtml/themes/default/recovery.tpl.c:23
 msgid "Click here to send a reset link"
-msgstr ""
-"Veuillez cliquer ici pour envoyer un lien permettant de réinitialiser votre "
-"mot de passe"
+msgstr "Veuillez cliquer ici pour envoyer un lien permettant de réinitialiser votre mot de passe"
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
-msgstr ""
-"Si aucune des méthodes ne vous intéresse, veuillez contacter votre "
-"administrateur système pour changer votre mot de passe"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr "Si aucune des méthodes ne vous intéresse, veuillez contacter votre administrateur système pour changer votre mot de passe"
 
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Cette fenêtre vous permet de changer votre mot de passe de manière simple. "
-"Entrez le mot de passe actuel et le nouveau mot de passe (deux fois) dans "
-"les champs ci-dessous et appuyez sur le bouton 'Changer'."
+msgstr "Cette fenêtre vous permet de changer votre mot de passe de manière simple. Entrez le mot de passe actuel et le nouveau mot de passe (deux fois) dans les champs ci-dessous et appuyez sur le bouton 'Changer'."
 
 #: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
@@ -5316,9 +4897,9 @@ msgstr "Nouveau mot de passe"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr "Niveau de sécurité du mot de passe"
 
@@ -5350,24 +4931,18 @@ msgstr "Votre mot de passe à été changé avec succès."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr ""
-"Entrez votre adresse de messagerie actuel dans le champ si dessous et "
-"appuyer sur le bouton 'Changer'"
+msgstr "Entrez votre adresse de messagerie actuel dans le champ si dessous et appuyer sur le bouton 'Changer'"
 
 #: ihtml/themes/default/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr ""
-"indiquez votre email en forme longue, ex: Jules Martin => jules.martin@acme."
-"com"
+msgstr "indiquez votre email en forme longue, ex: Jules Martin => jules.martin@acme.com"
 
 #: ihtml/themes/default/recovery.tpl.c:95
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr ""
-"La fonction de récupération des mots de passe n'est pas activée. Si vous "
-"avez perdu votre mot de passe, contacter votre administrateur réseau"
+msgstr "La fonction de récupération des mots de passe n'est pas activée. Si vous avez perdu votre mot de passe, contacter votre administrateur réseau"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:2
 msgid "Restoring object snapshots"
@@ -5377,29 +4952,20 @@ msgstr "Restaurer des copie instantanés des objets"
 msgid ""
 "This procedure will restore a snapshot of the selected object. It will "
 "replace the existing object after pressing the folder icon."
-msgstr ""
-"Cette procédure va restaurer un copie instantanée de l'objet sélectionné. "
-"Cela va remplacer l'objet existant après que vous ayez cliqué sur l’icône "
-"\"dossier\""
+msgstr "Cette procédure va restaurer un copie instantanée de l'objet sélectionné. Cela va remplacer l'objet existant après que vous ayez cliqué sur l’icône \"dossier\""
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:8
 msgid ""
 "Remember that DNS configuration and database entries could not be restored. "
 "For some objects it is only necessary to open and save them again (goFon), "
 "but some entries must be recreated manually."
-msgstr ""
-"Souvenez vous que la configuration DNS et les base de données ne peuvent pas "
-"être restaurées. Pour certains objets il est juste nécessaire de les ouvrir "
-"et de les sauvegarder à nouveau (goFon), certaines entrée cependant devront "
-"être recrées manuellement."
+msgstr "Souvenez vous que la configuration DNS et les base de données ne peuvent pas être restaurées. Pour certains objets il est juste nécessaire de les ouvrir et de les sauvegarder à nouveau (goFon), certaines entrée cependant devront être recrées manuellement."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:11
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"N'oubliez pas de vérifier les références avec les autres objets, par exemple "
-"est ce que l'imprimante sélectionnée existe encore ?"
+msgstr "N'oubliez pas de vérifier les références avec les autres objets, par exemple est ce que l'imprimante sélectionnée existe encore ?"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5407,9 +4973,7 @@ msgstr "Il n'y a pas de snapshots disponibles qui pourrait être restaurés"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Choisissez une copie instantanée et cliquez sur l'image du répertoire, pour "
-"restaurer la copie"
+msgstr "Choisissez une copie instantanée et cliquez sur l'image du répertoire, pour restaurer la copie"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5420,19 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Cette procédure va créer une copie instantanée de l'objet sélectionné. Il "
-"sera stocké dans une branche spéciale de votre annuaire et pourra être "
-"restauré plus tard."
+msgstr "Cette procédure va créer une copie instantanée de l'objet sélectionné. Il sera stocké dans une branche spéciale de votre annuaire et pourra être restauré plus tard."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Souvenez vous que les entrées dans les base de données, les configurations "
-"DNS et probablement les zones crées dans les serveurs ne seront pas stockées "
-"dans les copie instantanées."
+msgstr "Souvenez vous que les entrées dans les base de données, les configurations DNS et probablement les zones crées dans les serveurs ne seront pas stockées dans les copie instantanées."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5447,19 +5005,14 @@ msgstr "Raison pour la génération de cette copie instantanée"
 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."
+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."
 
 #: ihtml/themes/default/simple-remove.tpl.c:8
 #: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/remove.tpl.c:8
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
-"'Annuler' pour abandonner."
+msgstr "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur 'Annuler' pour abandonner."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5470,11 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Si la détection de ce verrou est fausse, une autre personne a manifestement "
-"fermé la fenêtre de son navigateur durant une opération de modification "
-"d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur "
-"le bouton 'Éditer malgré tout'."
+msgstr "Si la détection de ce verrou est fausse, une autre personne a manifestement fermé la fenêtre de son navigateur durant une opération de modification d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur le bouton 'Éditer malgré tout'."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5482,16 +5031,11 @@ msgstr "Lecture seule"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"L'option size limit rend les opérations LDAP plus rapides et permet au "
-"serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile "
-"de gérer des grandes bases de données sans de longs temps d'attentes, serait "
-"de limiter la recherche à des valeurs plus petites et d'utiliser les filtres "
-"pour obtenir les valeurs que vous recherchez."
+msgstr "L'option size limit rend les opérations LDAP plus rapides et permet au serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile de gérer des grandes bases de données sans de longs temps d'attentes, serait de limiter la recherche à des valeurs plus petites et d'utiliser les filtres pour obtenir les valeurs que vous recherchez."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5499,18 +5043,13 @@ msgstr "Veuillez choisir la façon de réagir pour cette session"
 
 #: ihtml/themes/default/sizelimit.tpl.c:8
 msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignorer cette erreur et montrer toutes les entrées retournées par le serveur "
-"LDAP"
+msgstr "ignorer cette erreur et montrer toutes les entrées retournées par le serveur LDAP"
 
 #: ihtml/themes/default/sizelimit.tpl.c:11
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce "
-"au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
-"restreindre les données a visualiser"
+msgstr "ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce au paramètre sizelimit défini et laissez moi utiliser les filtres pour restreindre les données a visualiser"
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5578,18 +5117,11 @@ msgstr "Connecté:"
 msgid "Session expires in %d!"
 msgstr "La session expire dans %d !"
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "Menu principal de FusionDirectory"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Cela peut être utilisé par plusieurs groupes. 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."
+msgstr "Cela peut être utilisé par plusieurs groupes. 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."
 
 #: ihtml/themes/default/logout-close.tpl.c:2
 msgid "Your FusionDirectory session has been closed!"
@@ -5599,9 +5131,7 @@ msgstr "Votre session FusionDirectory à expiré !"
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Veuillez fermer la fenêtre de votre navigateur et vider les cache des mots "
-"de passe pour éviter l'authentification automatique par votre navigateur."
+msgstr "Veuillez fermer la fenêtre de votre navigateur et vider les cache des mots de passe pour éviter l'authentification automatique par votre navigateur."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5609,20 +5139,17 @@ msgstr "Modifier votre mot de passe"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Cette fenêtre vous permet de changer votre mot de passe de manière simple. "
-"Entrez le mot de passe actuel et le nouveau mot de passe (deux fois) dans "
-"les champs ci-dessous et appuyez sur le bouton 'Changer'."
+msgstr "Cette fenêtre vous permet de changer votre mot de passe de manière simple. Entrez le mot de passe actuel et le nouveau mot de passe (deux fois) dans les champs ci-dessous et appuyez sur le bouton 'Changer'."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
@@ -5635,26 +5162,17 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr ""
-"Certaines valeurs doivent être unique dans tout l'arbre et certaines "
-"combinaisons n'ont pas de sens. FusionDirectory vous montre les valeurs "
-"correspondantes. Veuillez maintenir les valeurs pour respecter les "
-"politiques de sécurité."
+msgstr "Certaines valeurs doivent être unique dans tout l'arbre et certaines combinaisons n'ont pas de sens. FusionDirectory vous montre les valeurs correspondantes. Veuillez maintenir les valeurs pour respecter les politiques de sécurité."
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Veuillez vous souvenir que certaines propriétés comme les copie instantanées "
-"ne seront pas copiés !"
+msgstr "Veuillez vous souvenir que certaines propriétés comme les copie instantanées ne seront pas copiés !"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr ""
-"Ou si vous couper ou copiez un entrée avec FusionDirectory et que vous "
-"effacer la source, vous pouvez rencontrer des erreurs en tentant de le "
-"coller à nouveau !"
+msgstr "Ou si vous couper ou copiez un entrée avec FusionDirectory et que vous effacer la source, vous pouvez rencontrer des erreurs en tentant de le coller à nouveau !"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5676,8 +5194,7 @@ msgstr "Vérifier votre mot de passe"
 
 #: setup/setup_ldap.tpl.c:2
 msgid "Please choose the LDAP user to be used by FusionDirectory"
-msgstr ""
-"Veuillez choisir l'utilisateur LDAP qui sera utilise par FusionDirectory"
+msgstr "Veuillez choisir l'utilisateur LDAP qui sera utilise par FusionDirectory"
 
 #: setup/setup_ldap.tpl.c:5
 msgid "Search"
@@ -5714,8 +5231,7 @@ msgstr "DN de l'administrateur"
 
 #: setup/setup_ldap.tpl.c:47
 msgid "Automatically append LDAP base to admin DN"
-msgstr ""
-"Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
+msgstr "Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
 
 #: setup/setup_ldap.tpl.c:50
 msgid "Admin password"
@@ -5774,10 +5290,7 @@ msgid ""
 "FusionDirectory supports several encryption types for your passwords. "
 "Normally this is adjustable via user templates, but you can specify a "
 "default method to be used here, too."
-msgstr ""
-"FusionDirectory supporte différents types de cryptage pour vos mots de "
-"passe. Normalement ceci est ajustable avec des modèles utilisateurs, mais "
-"vous pouvez spécifier ici une méthode qui sera utilisée par défaut."
+msgstr "FusionDirectory supporte différents types de cryptage pour vos mots de passe. Normalement ceci est ajustable avec des modèles utilisateurs, mais vous pouvez spécifier ici une méthode qui sera utilisée par défaut."
 
 #: setup/setup_config1.tpl.c:68
 msgid ""
@@ -5785,44 +5298,28 @@ msgid ""
 "This is a workaround till OpenLDAP's in directory ACI's are    fully "
 "implemented. For this to work, we need the admin DN and the corresponding "
 "password."
-msgstr ""
-"FusionDirectory agit toujours comme un administrateur et gère les droits "
-"(ACLs) en interne. C'est un procédé utilisé en attendant que les ACI de "
-"OpenLDAP soient finalisées. Pour ces raisons il est nécessaire d'indiquer le "
-"DN de l'administrateur et son mot de passe."
+msgstr "FusionDirectory agit toujours comme un administrateur et gère les droits (ACLs) en interne. C'est un procédé utilisé en attendant que les ACI de OpenLDAP soient finalisées. Pour ces raisons il est nécessaire d'indiquer le DN de l'administrateur et son mot de passe."
 
 #: setup/setup_config1.tpl.c:71
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where "
 "FusionDirectory saves people and groups, including the way accounts get "
 "created. Check the values below if the fit your needs."
-msgstr ""
-"Des paramètres basiques du serveur LDAP sont modifiables et affectent "
-"l'endroit où FusionDirectory va enregistrer les utilisateurs et les groupes, "
-"incluant la façon dont vont être créés les comptes. Vérifiez les valeurs "
-"suivantes afin quelles correspondent à vos besoins."
+msgstr "Des paramètres basiques du serveur LDAP sont modifiables et affectent l'endroit où FusionDirectory va enregistrer les utilisateurs et les groupes, incluant la façon dont vont être créés les comptes. Vérifiez les valeurs suivantes afin quelles correspondent à vos besoins."
 
 #: setup/setup_config1.tpl.c:74
 msgid ""
 "FusionDirectory has modular support for several mail methods. These methods "
 "provide interfaces to users mailboxes and general handling    for quotas. "
 "You can choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"FusionDirectory à un support modulaire des méthodes de messagerie. Ces "
-"méthodes fournissent des interfaces vers les boîtes à messages des "
-"utilisateurs ainsi que la gestion de leurs quotas. Vous pouvez choisir "
-"l'extension dummy pour que FusionDirectory ne touche a rien."
+msgstr "FusionDirectory à un support modulaire des méthodes de messagerie. Ces méthodes fournissent des interfaces vers les boîtes à messages des utilisateurs ainsi que la gestion de leurs quotas. Vous pouvez choisir l'extension dummy pour que FusionDirectory ne touche a rien."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
-msgstr ""
-"Pendant l'inspection LDAP, nous allons regarder pour les problèmes "
-"classiques qui peuvent arriver lorsque l'on migre vers une administration "
-"basée sur FusionDirectory. Vous pouvez fixer les problèmes si dessous afin "
-"de procurer une administration facilitée."
+msgstr "Pendant l'inspection LDAP, nous allons regarder pour les problèmes classiques qui peuvent arriver lorsque l'on migre vers une administration basée sur FusionDirectory. Vous pouvez fixer les problèmes si dessous afin de procurer une administration facilitée."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -5858,20 +5355,14 @@ msgstr "Bouger les groupes dans le groupe configuré"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Ce dialogue permet de bouger un couple de groupes dans le groupe configuré. "
-"Exécuter cela peut améliorer votre service LDAP."
+msgstr "Ce dialogue permet de bouger un couple de groupes dans le groupe configuré. Exécuter cela peut améliorer votre service LDAP."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Soyez prudent avec cette opération ! Il peut exister des références qui "
-"pointent vers ces groupes. Le programme d'installation de FusionDirectory ne "
-"peut pas migrer ces références, vous préférerez peut être annuler la "
-"migration dans ce cas."
+msgstr "Soyez prudent avec cette opération ! Il peut exister des références qui pointent vers ces groupes. Le programme d'installation de FusionDirectory ne peut pas migrer ces références, vous préférerez peut être annuler la migration dans ce cas."
 
 #: setup/setup_migrate.tpl.c:32
 msgid "Move selected groups into this group tree"
@@ -5899,21 +5390,14 @@ msgstr "Bouger les utilisateurs dans la branche utilisateur configurée"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Ce dialogue permet de bouger un ensemble d'utilisateurs dans la branche "
-"utilisateur configurée. Exécuter cette opération peut améliorer votre "
-"service LDAP."
+msgstr "Ce dialogue permet de bouger un ensemble d'utilisateurs dans la branche utilisateur configurée. Exécuter cette opération peut améliorer votre service LDAP."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Soyez prudent avec cette opération ! Il peut exister des références qui "
-"pointent vers ces utilisateurs. Le programme d'installation de "
-"FusionDirectory ne peut pas migrer ces références, vous préférerez peut être "
-"annuler la migration dans ce cas."
+msgstr "Soyez prudent avec cette opération ! Il peut exister des références qui pointent vers ces utilisateurs. Le programme d'installation de FusionDirectory ne peut pas migrer ces références, vous préférerez peut être annuler la migration dans ce cas."
 
 #: setup/setup_migrate.tpl.c:59
 msgid "Move selected users into this people tree"
@@ -5927,9 +5411,7 @@ msgstr "Migrer les compte administrateur de GOsa 2.5"
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into "
 "FusionDirectory 1.0 useable accounts."
-msgstr ""
-"Cette boite de dialogue permet la migration des comptes administrateurs de "
-"GOsa 2.5 vers FusionDirectory 1.0."
+msgstr "Cette boite de dialogue permet la migration des comptes administrateurs de GOsa 2.5 vers FusionDirectory 1.0."
 
 #: setup/setup_migrate.tpl.c:107
 msgid "Abort"
@@ -5943,9 +5425,7 @@ msgstr "Créer un nouveau compte administrateur pour FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"Ce dialogue vas automatiquement créer un nouveau super utilisateur dans "
-"votre arbre LDAP."
+msgstr "Ce dialogue vas automatiquement créer un nouveau super utilisateur dans votre arbre LDAP."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
@@ -5960,10 +5440,7 @@ msgid ""
 "The listed departments are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of entries, select them "
 "and use the migrate button below."
-msgstr ""
-"Les département listés sont actuellement invisibles dans l'interface "
-"utilisateur de FusionDirectory. Si vous voulez changer cela pour un certain "
-"nombre d'entrée, sélectionnez les et utilisez le bouton migration ci dessous."
+msgstr "Les département listés sont actuellement invisibles dans l'interface utilisateur de FusionDirectory. Si vous voulez changer cela pour un certain nombre d'entrée, sélectionnez les et utilisez le bouton migration ci dessous."
 
 #: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
 #: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
@@ -5971,36 +5448,26 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Si vous voulez savoir ce qui sera effectué lorsque vous migrerez les entrées "
-"sélectionnées, utilisez le bouton 'Montrer les changements' pour voir le "
-"fichier LDIF."
+msgstr "Si vous voulez savoir ce qui sera effectué lorsque vous migrerez les entrées sélectionnées, utilisez le bouton 'Montrer les changements' pour voir le fichier LDIF."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
 "The listed users are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of users, just select "
 "them and use the 'Migrate' button below."
-msgstr ""
-"Les utilisateurs listés sont actuellement invisibles dans l'interface "
-"utilisateur de FusionDirectory. Si vous voulez changer ceci pour certains "
-"d'utilisateurs, veuillez les sélectionner et utiliser le bouton 'migration' "
-"ci dessous."
+msgstr "Les utilisateurs listés sont actuellement invisibles dans l'interface utilisateur de FusionDirectory. Si vous voulez changer ceci pour certains d'utilisateurs, veuillez les sélectionner et utiliser le bouton 'migration' ci dessous."
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Les périphériques listés sont actuellement invisibles dans l'interface de "
-"FusionDirectory. Si vous voulez changer ceci pour certains périphériques, "
-"veuillez les sélectionner et utiliser le bouton 'migration' ci dessous."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr "Les périphériques listés sont actuellement invisibles dans l'interface de FusionDirectory. Si vous voulez changer ceci pour certains périphériques, veuillez les sélectionner et utiliser le bouton 'migration' ci dessous."
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "Rafraîchir"
 
@@ -6009,20 +5476,14 @@ msgid ""
 "The listed services are currently invalid for the FusionDirectory version "
 "you are going to install. If you want to update a couple of service, just "
 "select them and use the 'Migrate' button below."
-msgstr ""
-"Les services listés sont actuellement invisibles dans l'interface de "
-"FusionDirectory. Si vous voulez changer ceci certains services, veuillez les "
-"sélectionner et utiliser le bouton 'migration' ci dessous."
+msgstr "Les services listés sont actuellement invisibles dans l'interface de FusionDirectory. Si vous voulez changer ceci certains services, veuillez les sélectionner et utiliser le bouton 'migration' ci dessous."
 
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Les menus listés sont actuellement invisibles dans l'interface de "
-"FusionDirectory. Si vous voulez changer ceci pour certains menus, veuillez "
-"les sélectionner et utiliser le bouton 'migration' ci dessous."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr "Les menus listés sont actuellement invisibles dans l'interface de FusionDirectory. Si vous voulez changer ceci pour certains menus, veuillez les sélectionner et utiliser le bouton 'migration' ci dessous."
 
 #: setup/setup_feedback.tpl.c:2
 msgid "Feedback successfully send"
@@ -6042,12 +5503,9 @@ msgstr "Envoyer vos commentaire au membres du projet FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
-msgstr ""
-"Quand vous cochez cette option, FusionDirectory essayera de se connecter à "
-"http://www.fusiondirectory.org pour pouvoir transmettre votre réponse de "
-"manière anonyme."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr "Quand vous cochez cette option, FusionDirectory essayera de se connecter à http://www.fusiondirectory.org pour pouvoir transmettre votre réponse de manière anonyme."
 
 #: setup/setup_feedback.tpl.c:26
 msgid "Did the setup procedure help you to get started?"
@@ -6067,8 +5525,7 @@ msgstr "Je l'utilise depuis "
 
 #: setup/setup_feedback.tpl.c:50
 msgid "Select the year since when you are using FusionDirectory"
-msgstr ""
-"Veuillez sélectionner l'année depuis laquelle vous utilisez FusionDirectory"
+msgstr "Veuillez sélectionner l'année depuis laquelle vous utilisez FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:53
 msgid "What operating system / distribution do you use?"
@@ -6107,10 +5564,9 @@ msgid "What features of FusionDirectory do you use?"
 msgstr "Quel fonctionnalités de FusionDirectory utilisez vous ?"
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
-msgstr ""
-"Quelle fonctionnalités voulez vous voir dans les prochaines versions de "
-"FusionDirectory ?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
+msgstr "Quelle fonctionnalités voulez vous voir dans les prochaines versions de FusionDirectory ?"
 
 #: setup/setup_feedback.tpl.c:83
 msgid "Send feedback"
@@ -6123,12 +5579,9 @@ msgstr "Veuillez sélectionner la langue par défaut"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"Maintenant vous pouvez choisir la langue par défaut. Automatique utilisera "
-"la langue demandée par le navigateur. Ce paramètre peut être configuré par "
-"utilisateur."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "Maintenant vous pouvez choisir la langue par défaut. Automatique utilisera la langue demandée par le navigateur. Ce paramètre peut être configuré par utilisateur."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -6142,27 +5595,27 @@ msgstr "Veuillez indiquer votre fuseau horaire préféré ici"
 msgid "FusionDirectory core settings"
 msgstr "Paramètres essentiels de FusionDirectory"
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Activer le vérrouillage lors de l'édition"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr "Journaux systèmes de FusionDirectory"
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Force register_globals à être désactivé"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Afficher les erreur PHP"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Activé"
 
@@ -6183,10 +5636,7 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr ""
-"Il semble que c'est votre première installation de FusionDirectory - nous "
-"n'avons pas trouvé de configuration. Ce programme d'aide à l'installation "
-"vous aidera à configurer FusionDirectory."
+msgstr "Il semble que c'est votre première installation de FusionDirectory - nous n'avons pas trouvé de configuration. Ce programme d'aide à l'installation vous aidera à configurer FusionDirectory."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -6198,9 +5648,7 @@ msgstr "Créer une simple configuration mono site"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr ""
-"Essaye de trouver si il existe des problèmes dans votre configuration PHP ou "
-"LDAP"
+msgstr "Essaye de trouver si il existe des problèmes dans votre configuration PHP ou LDAP"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
@@ -6232,10 +5680,7 @@ msgid ""
 "creating the file '/tmp/fusiondirectory.auth', containing the current "
 "session ID on the servers local filesystem. This can be done by executing "
 "the following command:"
-msgstr ""
-"Pour des raisons de sécurité vous devez vous authentifier en créant le "
-"fichier '/tmp/fusiondirectory.auth', contenant l'ID de la session sur le(s) "
-"serveur(s). Ceci peut être réalisé en exécutant la commande suivante:"
+msgstr "Pour des raisons de sécurité vous devez vous authentifier en créant le fichier '/tmp/fusiondirectory.auth', contenant l'ID de la session sur le(s) serveur(s). Ceci peut être réalisé en exécutant la commande suivante:"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -6283,20 +5728,15 @@ msgstr "La vérification des schéma à échoué"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"Impossible de lire les schémas, toutes les vérifications sont annulées. "
-"Ajuster les acl de votre annuaire ldap."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "Impossible de lire les schémas, toutes les vérifications sont annulées. Ajuster les acl de votre annuaire ldap."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
 "It seems that your ldap database wasn't initialized yet. This might be the "
 "reason why FusionDirectory can't read your schema configuration!"
-msgstr ""
-"Il semble que votre annuaire LDAP n'a pas encore été configuré. C'est peut "
-"être cela qui empêche FusionDirectory de lire la configuration de vos "
-"schémas !"
+msgstr "Il semble que votre annuaire LDAP n'a pas encore été configuré. C'est peut être cela qui empêche FusionDirectory de lire la configuration de vos schémas !"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
@@ -6308,8 +5748,7 @@ msgstr "Exécuter"
 
 #: setup/setup_finish.tpl.c:8
 msgid "to put the correct right on fusiondirectory.conf"
-msgstr ""
-"pour mettre les droits correctement sur le fichier fusiondirectory.conf"
+msgstr "pour mettre les droits correctement sur le fichier fusiondirectory.conf"
 
 #: setup/setup_finish.tpl.c:11
 msgid "Download configuration"
@@ -6340,15 +5779,12 @@ msgstr "Cette objet n'a pas de relation avec d'autres objets."
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Votre mot de passe a été changé. N'oubliez pas de modifier les programmes "
-"qui l'utilisent."
+msgstr "Votre mot de passe a été changé. N'oubliez pas de modifier les programmes qui l'utilisent."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
 msgid "You have no permission to change your password at this time"
-msgstr ""
-"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
+msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
 
 #: plugins/personal/password/password.tpl.c:2
 #: plugins/personal/generic/password.tpl.c:2
@@ -6356,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Pour changer votre mot de passe, veuillez utiliser les champs ci-dessous. "
-"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
-"mot de passe car sans lui vous ne serez pas capable de vous identifier."
+msgstr "Pour changer votre mot de passe, veuillez utiliser les champs ci-dessous. Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau mot de passe car sans lui vous ne serez pas capable de vous identifier."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6367,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Changer le mot de passe affecte votre identification sur la messagerie, le "
-"proxy, samba, et les services unix."
+msgstr "Changer le mot de passe affecte votre identification sur la messagerie, le proxy, samba, et les services unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "Votre mot de passe à expiré. Choisissez un nouveau mot de passe !"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Changement de mot de passe"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "Proposition"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "Choisir un mot de passe"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Attribuer le mot de passe"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Effacer les données dans les champs"
 
@@ -6415,55 +5841,10 @@ msgstr "Effacer les données dans les champs"
 msgid "Your password hash method will not be changed!"
 msgstr "Votre méthode de cryptage des mots de passe ne sera pas changé !"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificats"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Certificat standard"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Certificat S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Certificat PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Numéro de série du certificat"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Image personnelle"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Suppression de l'image personnelle"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Préférences utilisateur"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Nom de famille"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Prénom"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Effacer le mot de passe"
@@ -6472,59 +5853,17 @@ msgstr "Effacer le mot de passe"
 msgid "Set new password"
 msgstr "Attribuer un nouveau mot de passe"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Informations personnelles"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Changer la photo"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nom du modèle"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Langue préférée"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Numéro de téléphone privé"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Format de stockage des mots de passe"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Restreindre le login à"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP ou réseau"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Informations sur l'entreprise"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "No. du département."
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "No. de l'employé."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Image personnelle"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "No. de bureau."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Veuillez utiliser l'onglet téléphone"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Suppression de l'image personnelle"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6541,23 +5880,6 @@ msgstr "Groupes Samba"
 msgid "Show mail groups"
 msgstr "Groupes de messagerie"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Serveurs"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Stations de travail"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr "Montrer les systèmes Windows"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Terminaux"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6576,15 +5898,6 @@ msgstr "Nom du lieu à créer"
 msgid "Descriptive text for department"
 msgstr "Description du département"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Marquer le département comme une entité administrative indépendante"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Opération en cours"
@@ -6593,9 +5906,7 @@ msgstr "Opération en cours"
 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."
+msgstr "Votre navigateur ne supporte pas les iframes, veuillez utiliser ce lien pour effectuer l'opération demandée."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6609,9 +5920,7 @@ msgstr "Vous êtes occupé à bouger/renommer ce département."
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"La modification de l'attribut 'ou' ou la base d'un département peut "
-"corrompre les entrées acls et snapshot pour tout les objets."
+msgstr "La modification de l'attribut 'ou' ou la base d'un département peut corrompre les entrées acls et snapshot pour tout les objets."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6621,9 +5930,7 @@ msgstr "FusionDirectory ne PEUT PAS encore corriger ceci pour vous."
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Avant de confirmer cette action, vérifiez que tout se passera comme prévu, "
-"la meilleure solution est probablement une sauvegarde."
+msgstr "Avant de confirmer cette action, vérifiez que tout se passera comme prévu, la meilleure solution est probablement une sauvegarde."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6668,20 +5975,14 @@ msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
 "check if your really want to do this since there is no way for "
 "FusionDirectory to get your data back."
-msgstr ""
-"Ceci inclus tous les comptes systèmes, etc... dans cette branche. Veuillez "
-"vérifier si vous voulez réaliser cette opération étant donné qu'il est "
-"impossible pour FusionDirectory de récupérer vos données."
+msgstr "Ceci inclus tous les comptes systèmes, etc... dans cette branche. Veuillez vérifier si vous voulez réaliser cette opération étant donné qu'il est impossible pour FusionDirectory de récupérer vos données."
 
 #: plugins/admin/departments/remove.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."
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6711,9 +6012,7 @@ msgstr "Appliquer un modèle"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Appliquer un modèle à plusieurs utilisateurs remplacera tout les attributs "
-"de ces utilisateurs par ceux définis dans le modèle."
+msgstr "Appliquer un modèle à plusieurs utilisateurs remplacera tout les attributs de ces utilisateurs par ceux définis dans le modèle."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6728,14 +6027,11 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"La création d'un nouvel utilisateur peut être facilité en utilisant les "
-"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
-"Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
+msgstr "La création d'un nouvel utilisateur peut être facilité en utilisant les modèles. De nombreuses informations seront ainsi remplies automatiquement. Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
-msgstr "Montrer les modèles"
+msgstr "Afficher les modèles"
 
 #: plugins/admin/users/user-filter.tpl.c:8
 msgid "Show functional users"
@@ -6755,46 +6051,35 @@ msgstr "Montrer les utilisateurs samba"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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 assurez que vous "
-"voulez effectuez cette opération étant donné qu'il est impossible pour "
-"FusionDirectory de récupérer vos données."
+"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 assurez que vous voulez effectuez cette opération étant donné qu'il est impossible pour FusionDirectory de récupérer vos données."
 
 #: plugins/admin/users/password.tpl.c:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Pour changer le mot de passe des utilisateurs, utilisez le champ ci-dessous. "
-"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
-"mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
+msgstr "Pour changer le mot de passe des utilisateurs, utilisez le champ ci-dessous. Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Sécurité"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "Saisie du mot de passe"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Forcer le changement de mot de passe a la prochaine connexion."
 
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:5
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:8
 msgid "Show users"
-msgstr "Utilisateurs"
+msgstr "Montrer les utilisateurs"
 
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:8
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:11
 msgid "Show groups"
-msgstr "Groupes"
+msgstr "Montrer les groupes"
 
 #: plugins/admin/groups/paste_generic.tpl.c:2
 msgid "Group settings"
@@ -6815,9 +6100,7 @@ msgstr "Nom posix du groupe"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalement les IDs sont générés automatiquement, vous pouvez en spécifier "
-"un manuellement"
+msgstr "Normalement les IDs sont générés automatiquement, vous pouvez en spécifier un manuellement"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6833,10 +6116,7 @@ msgstr "Forcer le numéro d'ID"
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Ce groupe est un groupe principal contenant des utilisateurs. Veuillez vous "
-"assurez que vous voulez bien exécuter cette action étant donné qu'il est "
-"impossible pour FusionDirectory de récupérer vos données."
+msgstr "Ce groupe est un groupe principal contenant des utilisateurs. Veuillez vous assurez que vous voulez bien exécuter cette action étant donné qu'il est impossible pour FusionDirectory de récupérer vos données."
 
 #: plugins/admin/groups/trust_machines.tpl.c:2
 #: plugins/admin/ogroups/trust_machines.tpl.c:2
@@ -6935,6 +6215,11 @@ msgstr "Serveur"
 msgid "Show workstation"
 msgstr "Stations de travail"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr "Montrer les systèmes Windows"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "Terminaux"
@@ -6999,11 +6284,14 @@ msgstr "Nom du groupe"
 msgid "Member objects"
 msgstr "Objets membres"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Edition multiple"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Montrez les serveurs"
 
-#~ msgid "In all groups"
-#~ msgstr "Dans tous les groupes"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Station de travail Windows"
 
-#~ msgid "Not in all groups"
-#~ msgstr "Pas dans tous les groupes"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Terminaux"
diff --git a/locale/fa_IR/fusiondirectory.po b/locale/id.po
similarity index 69%
rename from locale/fa_IR/fusiondirectory.po
rename to locale/id.po
index ac9fe6ee7a04a1e8821b1c4de54dc781d6286ee2..b0f67577618939dff53cfd942b5343b50e0d5923 100644
--- a/locale/fa_IR/fusiondirectory.po
+++ b/locale/id.po
@@ -1,55 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# mbbn <biabani.mohammad@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/"
-"FusionDirectory/language/fa_IR/)\n"
-"Language: fa_IR\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -70,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -181,57 +178,56 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr ""
 
@@ -241,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -290,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
-msgstr "خطا"
+msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
-msgstr "خطای LDAP"
+msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -522,13 +505,10 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -704,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -723,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -818,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -869,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -877,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
-msgstr "خطا"
+msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -926,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -997,134 +976,133 @@ msgstr ""
 #: html/main.php:136
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "فایل '%s' موجود نیست - لطفا '%s' را اجرا کنید تا مشکل را رفع نمایید."
+msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
-msgstr "پیکربندی PHP"
+msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
-msgstr "تغییر کلمه عبور"
+msgstr ""
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
-msgstr "اعتبار کلمه عبور شما پایان یافته، لطفا کلمه عبور خود را تغییر دهید!"
+msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "پیکربندی PHP"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1163,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "پیکربندی PHP"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr ""
@@ -1191,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1230,54 +1205,63 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
+
 #: plugins/generic/welcome/main.inc:26
 #, php-format
 msgid "Welcome %s!"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
-msgstr "فکس"
+msgstr ""
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1286,65 +1270,62 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
-msgstr "دپارتمان"
+msgstr ""
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
-msgstr "تلفن"
+msgstr ""
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1379,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1870,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "تلفن همراه"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "پیجر"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "کد پستی"
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2136,122 +1897,76 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
-msgid "Personal title"
-msgstr "عنوان شخصی"
-
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2263,66 +1978,52 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2330,305 +2031,438 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
@@ -2748,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2761,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
+msgid "Postal address"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "آدرس"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2891,17 +2710,17 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
-msgstr "کشور"
+msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:39
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2909,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr ""
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2944,11 +2765,24 @@ msgid "List of users"
 msgstr ""
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr ""
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr ""
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2960,7 +2794,7 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr ""
@@ -2981,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -2997,56 +2831,56 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
-msgstr "جواز"
+msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:391
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3054,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3113,48 +2947,94 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
-msgid "Group member"
+#: plugins/admin/groups/class_group.inc:1128
+msgid "Group member"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:23
-msgid "Group submenu entry"
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:31
-msgid "Group menu entry"
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:147
-msgid "Edit group"
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:160
-msgid "Remove group"
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
@@ -3163,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3275,7 +3151,7 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr ""
@@ -3293,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr ""
 
@@ -3313,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3387,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3418,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr ""
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr ""
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3491,31 +3374,31 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
-msgstr "خطای داخلی"
+msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
 #: include/class_session.inc:175
@@ -3528,7 +3411,7 @@ msgid "Show %s"
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3536,99 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3650,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3788,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3905,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3917,300 +3835,300 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr ""
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4231,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr ""
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr ""
 
@@ -4339,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr ""
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4556,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4619,223 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4895,7 +4816,6 @@ msgstr ""
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4905,6 +4825,7 @@ msgstr ""
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
 
@@ -4916,14 +4837,14 @@ msgstr ""
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:14
@@ -4956,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4976,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5110,9 +5031,9 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
 
@@ -5196,10 +5117,6 @@ msgstr ""
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5222,17 +5139,17 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr ""
 
@@ -5399,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5542,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5564,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5586,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5647,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5661,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5677,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5810,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5889,38 +5807,33 @@ msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr ""
 
@@ -5928,55 +5841,10 @@ msgstr ""
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "فامیل"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "نام"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr ""
@@ -5985,58 +5853,16 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
@@ -6054,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6089,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6251,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6263,15 +6063,11 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6419,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6482,3 +6283,15 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/id_ID/fusiondirectory.po b/locale/id_ID.po
similarity index 69%
rename from locale/id_ID/fusiondirectory.po
rename to locale/id_ID.po
index 59572731bcdaf50b6759d4b1163aa7438633af78..8d88abe660bb671548ede29f6e1985775a520703 100644
--- a/locale/id_ID/fusiondirectory.po
+++ b/locale/id_ID.po
@@ -1,53 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-02-12 10:26+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id_ID\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/FusionDirectory/language/id_ID/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -68,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -179,57 +178,56 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr ""
 
@@ -239,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -288,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -520,13 +505,10 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -702,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -721,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -816,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -867,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -875,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -924,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -997,123 +978,123 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -1168,16 +1149,12 @@ msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr ""
@@ -1187,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1226,54 +1205,63 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
+
 #: plugins/generic/welcome/main.inc:26
 #, php-format
 msgid "Welcome %s!"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1282,65 +1270,62 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1375,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1866,407 +1843,296 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
+#: plugins/personal/generic/class_user.inc:142
+msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
+#: plugins/personal/generic/class_user.inc:146
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
+#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
+msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
+#: plugins/personal/generic/class_user.inc:193
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:95
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
+#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
+#: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapShotDialog.inc:230
+#: plugins/generic/references/contents.tpl.c:5
+#: plugins/admin/departments/dcObject.tpl.c:11
+#: plugins/admin/departments/locality.tpl.c:11
+#: plugins/admin/departments/country.tpl.c:11
+#: plugins/admin/departments/organization.tpl.c:11
+#: plugins/admin/departments/generic.tpl.c:11
+#: plugins/admin/departments/domain.tpl.c:11
+#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
+#: plugins/admin/ogroups/generic.tpl.c:8
+msgid "Description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/organization.tpl.c:29
+#: plugins/admin/departments/organization.tpl.c:38
+#: plugins/admin/departments/generic.tpl.c:29
+#: plugins/admin/departments/generic.tpl.c:38
+msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
-msgid "Generic user settings"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
-#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
-#: plugins/admin/groups/userSelect/user-list.xml:14
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
-#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
-msgid "User"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
-msgid "Personal title"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:272
 #: plugins/admin/departments/class_organizationGeneric.inc:114
 #: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:120
 #: plugins/admin/departments/dep-list.xml:47
 #: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:280
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
-#: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
-#: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
-#: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
-#: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
-#: plugins/admin/departments/dcObject.tpl.c:11
-#: plugins/admin/departments/locality.tpl.c:11
-#: plugins/admin/departments/country.tpl.c:11
-#: plugins/admin/departments/organization.tpl.c:11
-#: plugins/admin/departments/generic.tpl.c:11
-#: plugins/admin/departments/domain.tpl.c:11
-#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
-#: plugins/admin/ogroups/generic.tpl.c:8
-msgid "Description"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
 #: plugins/admin/departments/dcObject.tpl.c:20
 #: plugins/admin/departments/locality.tpl.c:20
 #: plugins/admin/departments/country.tpl.c:20
@@ -2276,355 +2142,327 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
-#: plugins/admin/departments/organization.tpl.c:29
-#: plugins/admin/departments/organization.tpl.c:38
-#: plugins/admin/departments/generic.tpl.c:29
-#: plugins/admin/departments/generic.tpl.c:38
-msgid "Location"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
 msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
@@ -2744,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2757,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
+msgid "Postal address"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2887,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr ""
 
@@ -2896,8 +2719,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2905,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr ""
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2940,11 +2765,24 @@ msgid "List of users"
 msgstr ""
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr ""
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr ""
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2956,7 +2794,7 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr ""
@@ -2977,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -2993,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr ""
 
@@ -3010,39 +2848,39 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3050,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3109,48 +2947,94 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
-msgid "Group member"
+#: plugins/admin/groups/class_group.inc:1128
+msgid "Group member"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:23
-msgid "Group submenu entry"
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:31
-msgid "Group menu entry"
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:147
-msgid "Edit group"
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:160
-msgid "Remove group"
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
@@ -3159,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3271,7 +3151,7 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr ""
@@ -3289,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr ""
 
@@ -3309,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3383,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3414,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr ""
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr ""
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3487,29 +3374,29 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr ""
 
@@ -3524,7 +3411,7 @@ msgid "Show %s"
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3532,99 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3646,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3784,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3901,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3913,300 +3835,300 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr ""
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4227,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr ""
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr ""
 
@@ -4335,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr ""
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4552,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4615,223 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4891,7 +4816,6 @@ msgstr ""
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4901,6 +4825,7 @@ msgstr ""
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
 
@@ -4912,14 +4837,14 @@ msgstr ""
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:14
@@ -4952,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4972,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5106,9 +5031,9 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
 
@@ -5192,10 +5117,6 @@ msgstr ""
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5218,17 +5139,17 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr ""
 
@@ -5395,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5538,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5560,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5582,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5643,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5657,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5673,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5806,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5885,38 +5807,33 @@ msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr ""
 
@@ -5924,55 +5841,10 @@ msgstr ""
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr ""
@@ -5981,58 +5853,16 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
@@ -6050,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6085,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6247,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6259,15 +6063,11 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6415,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6478,3 +6283,15 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/it/fusiondirectory.po b/locale/it.po
similarity index 63%
rename from locale/it/fusiondirectory.po
rename to locale/it.po
index 2f425e138ab86c9b2d1dda9ac02b05c3c033f0f1..12c45fe2934de7b73cddde1b64ec4fda5acc3e7a 100644
--- a/locale/it/fusiondirectory.po
+++ b/locale/it.po
@@ -1,62 +1,55 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Alessandro Amici <a.amici@bopen.it>, 2005
-# Benoit Mortier <benoit.mortier@opensides.be>, 2012
-# poterealpopolo <giuliano@opensides.be>, 2011
-# poterealpopolo <giuliano@opensides.be>, 2013
-# poterealpopolo <giuliano@opensides.be>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/it/)\n"
-"Language: it\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr "Parametri di FusionDirectory 3/3"
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr "Personalizza alcuni parametri essenziali di Fusiondirectory"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "No"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Si"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Errore di configurazione"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "La durata della sessione deve contenere un valore numerico !"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
-msgstr ""
-"Il tempo massimo di una richiesta LDAP deve contenere un valore numerico !"
+msgstr "Il tempo massimo di una richiesta LDAP deve contenere un valore numerico !"
 
 #: setup/class_setupStep_Schema.inc:42 setup/class_setupStep_Schema.inc:43
 msgid "LDAP schema check"
@@ -75,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Questa tappa ti permette di impostare la tua lingua preferita."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatico"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "Ispezione dell'annuario LDAP"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analisi dell'annuario LDAP per la compatibilità con FusionDirectory"
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Verifica dell'oggetto radice"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "Ispezione delle classi di oggetti nell'oggetto radice"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "Verifica del permesso di accesso al database LDAP"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Verifica dei dipartimenti nascosti"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Verifica degli utenti nascosti"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Verifica del super amministratore"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Verifica degli utenti al di fuori del ramo \"people\""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Verifica dei gruppi al di fuori del ramo \"groups\""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Verifica dei possibili doppioni UID"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Verifica dei possibili doppioni GID"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "Verifica delle periferiche USB vecchio stile"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "Verifica dei vecchi servizi che dovranno essere migrati"
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "Verifica dei menu delle applicazioni \"vecchio stile\""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "La richiesta al database LDAP è fallita!"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Probabilmente manca l'oggetto radice."
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -184,59 +176,58 @@ msgstr "Probabilmente manca l'oggetto radice."
 #: plugins/admin/groups/remove.tpl.c:2 plugins/admin/acl/remove.tpl.c:2
 #: plugins/admin/ogroups/remove.tpl.c:2
 msgid "Warning"
-msgstr "Attenzione"
+msgstr "Avvertimento"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Ho trovato %s doppioni per l'attributo 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Ho trovato %s doppioni per l'attributo 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Ho trovato %s gruppi al di fuori del ramo '%s' configurato."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Sposta"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "Ho trovato %s utente(i) al di fuori del ramo '%s' configurato."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Fallito"
 
@@ -246,53 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr "L'utente '%s' specificato non ha un pieno accesso al database LDAP."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr ""
-"Ho trovato %s utenti(e) che non saranno visibili in FusionDirectory che sono "
-"incompleti."
-
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+msgstr "Ho trovato %s utenti(e) che non saranno visibili in FusionDirectory che sono incompleti."
+
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Migra"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Errore durante la migrazione"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Non posso migrare il dipartimento '%s':"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
+msgstr "Ho trovato %s departimenti(o) che non saranno visibili in FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Account amministrativi trovati per GOsa 2.5 : %s"
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
-msgstr ""
-"Non vi è alcun account di amministratore valido per FusionDirectory 1.0  nel "
-"tuo LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
+msgstr "Non vi è alcun account di amministratore valido per FusionDirectory 1.0  nel tuo LDAP."
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -300,237 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Crea"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Utenti"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
-msgstr "Gruppi di utenti"
+msgstr "Gruppi"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
-msgstr ""
-"Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario LDAP."
+msgstr "Non ho trovato alcun amministratore di FusionDirectory nel tuo annuario LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Impossibile aggiungere un ACL per l'utente '%s' :"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Errore d'immissione"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Errore nella password"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "Le password nuova e ripetuta non corrispondono !"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "Specifica un ID utente valido !"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Errore"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"L'ggiunta di un utenyte amministratore è fallita: l'oggetto '%s' esiste già !"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "L'ggiunta di un utenyte amministratore è fallita: l'oggetto '%s' esiste già !"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "Non posso spostare l'utente nel dipartimento richiesto !"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "Il gruppo sarà spostato da"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "verso"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "Aggiornamento anche delle seguenti referenze :"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "L'utente sarà spostato da"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "Le seguenti reference saranno aggiornate"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"Non trovo l'oggetto radice di LDAP. É indispensabile per poter usare "
-"l'annuario LDAP."
+msgstr "Non trovo l'oggetto radice di LDAP. É indispensabile per poter usare l'annuario LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Tentativo di creazione dell'oggetto radice"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr "Non ho potuto creare l'oggetto radice. Dovrai provare a farlo da te."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "L'oggetto di classe '%s' richiesto per FusionDirectory è mancante !"
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Verifica la tua installazione."
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"Impossibile gestire il tipo di oggetto strutturale del tuo oggetto radice. "
-"Prova ad aggiungere manualmente la classe d'oggetto '%s'. "
+msgstr "Impossibile gestire il tipo di oggetto strutturale del tuo oggetto radice. Prova ad aggiungere manualmente la classe d'oggetto '%s'. "
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "La copia di '%s' verso '%s' non è riuscita :"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Ci sono %s periferiche che hanno bisogno di essere migrate."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "L'aggiunta di '%s' all'annuario LDAP non è riuscita: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "L'aggiornamento di '%s' non è riuscito: %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Ci sono %s servizi che hanno bisogno di essere migrati."
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Aggiungi"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -538,13 +505,10 @@ msgstr "Aggiungi"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
-msgstr "Rimuovi"
+msgstr "Elimina"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Ci sono %s menu di applicazioni che hanno bisogno di essere migrati. "
@@ -559,8 +523,7 @@ msgstr "Messaggio di benvenuto"
 
 #: setup/class_setupStep_Welcome.inc:40
 msgid "Welcome to FusionDirectory setup wizard"
-msgstr ""
-"Benvenuto nell'interfaccia di aiuto alla configurazione di FusionDirectory"
+msgstr "Benvenuto nell'interfaccia di aiuto alla configurazione di FusionDirectory"
 
 #: setup/class_setupStep_Checks.inc:38 setup/class_setupStep_Checks.inc:39
 msgid "Installation check"
@@ -568,8 +531,7 @@ msgstr "Verifica dell'istallazione"
 
 #: setup/class_setupStep_Checks.inc:40
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr ""
-"Verifiche di base della compatibilità PHP e delle estensioni necessarie"
+msgstr "Verifiche di base della compatibilità PHP e delle estensioni necessarie"
 
 #: setup/class_setupStep_Checks.inc:64
 msgid "Checking PHP version"
@@ -586,42 +548,32 @@ msgstr "Aggiorna ad una versione supportata."
 
 #: setup/class_setupStep_Checks.inc:73
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per poter comunicare con il "
-"server LDAP."
+msgstr "FusionDirectory ha bisogno di questo modulo per poter comunicare con il server LDAP."
 
 #: setup/class_setupStep_Checks.inc:81
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per l'interfaccia multilingue."
+msgstr "FusionDirectory ha bisogno di questo modulo per l'interfaccia multilingue."
 
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per comunicare con differenti "
-"tipi di server e protocolli."
+msgstr "FusionDirectory ha bisogno di questo modulo per comunicare con differenti tipi di server e protocolli."
 
 #: setup/class_setupStep_Checks.inc:97
 msgid "FusionDirectory requires this module for the samba integration."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per l'integrazione di Samba"
+msgstr "FusionDirectory ha bisogno di questo modulo per l'integrazione di Samba"
 
 #: setup/class_setupStep_Checks.inc:105
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr ""
-"FusionDirectory richiede il modulo 'mhash' oppure 'sha1' per poter "
-"utilizzare l'algoritmo di criptaggio SSHA."
+msgstr "FusionDirectory richiede il modulo 'mhash' oppure 'sha1' per poter utilizzare l'algoritmo di criptaggio SSHA."
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per comunicare con il server "
-"IMAP."
+msgstr "FusionDirectory ha bisogno di questo modulo per comunicare con il server IMAP."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "mbstring"
@@ -629,8 +581,7 @@ msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:121
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per gestire i caratteri Unicode."
+msgstr "FusionDirectory ha bisogno di questo modulo per gestire i caratteri Unicode."
 
 #: setup/class_setupStep_Checks.inc:128
 msgid "MDB2"
@@ -640,15 +591,13 @@ msgstr "MDB2"
 msgid ""
 "FusionDirectory requires this module to communicate with several supported "
 "databases."
-msgstr ""
-"FusionDirectory ha bisogno di questo modulo per comunicare con i database "
-"supportati."
+msgstr "FusionDirectory ha bisogno di questo modulo per comunicare con i database supportati."
 
 #: setup/class_setupStep_Checks.inc:134
 msgid ""
 "If you do not want to install MDB2 and won't use databases, remove the "
 "class_databaseManagement.inc file."
-msgstr ""
+msgstr "Se non si desidera installare MDB2 e non utilizzerà banche dati, rimuovere il file class_databaseManagement.inc."
 
 #: setup/class_setupStep_Checks.inc:138
 msgid "imagick"
@@ -656,8 +605,7 @@ msgstr "imagick"
 
 #: setup/class_setupStep_Checks.inc:139
 msgid "FusionDirectory requires this extension to handle images."
-msgstr ""
-"FusionDirectory ha bisogno di questa estensione per gestire le immagini."
+msgstr "FusionDirectory ha bisogno di questa estensione per gestire le immagini."
 
 #: setup/class_setupStep_Checks.inc:154
 msgid "compression module"
@@ -665,24 +613,18 @@ msgstr "modulo di compressione"
 
 #: setup/class_setupStep_Checks.inc:155
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr ""
-"FusionDirectory ha bisogno di questa estensione per gestire gli snapshot (le "
-"copie istantanee)."
+msgstr "FusionDirectory ha bisogno di questa estensione per gestire gli snapshot (le copie istantanee)."
 
 #: setup/class_setupStep_Checks.inc:166
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"register_globals è un meccanismo PHP che permette di registrare tutte le "
-"variabili globali affinchè gli scripts possano accedervi senza cambiare la "
-"portata delle variabili. Questo puó generare un rischio per la sicurezza."
+msgstr "register_globals è un meccanismo PHP che permette di registrare tutte le variabili globali affinchè gli scripts possano accedervi senza cambiare la portata delle variabili. Questo puó generare un rischio per la sicurezza."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr ""
-"Cerca l'opzione register_globals nel tuo file php.ini e impostalo su 'Off'."
+msgstr "Cerca l'opzione register_globals nel tuo file php.ini e impostalo su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
@@ -692,65 +634,49 @@ msgstr "PHP utilizza questa variabile per cancellare delle vecchie sessioni."
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Impostare questa variabile a \"1 giorno\" eviterà di perdere i coockies e le "
-"sessioni prima che siano realmente scadute."
+msgstr "Impostare questa variabile a \"1 giorno\" eviterà di perdere i coockies e le sessioni prima che siano realmente scadute."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Cerca la variabile 'session.gc_maxlifetime' nel tuo file php.ini e impostala "
-"a 86400 o un valore più grande."
+msgstr "Cerca la variabile 'session.gc_maxlifetime' nel tuo file php.ini e impostala a 86400 o un valore più grande."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
 msgid "Off"
-msgstr "Off"
+msgstr "Spento"
 
 #: setup/class_setupStep_Checks.inc:185
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr ""
-"Per non avere problemi nell'uso di FusionDirectory, è necessario impostare "
-"l'opzione 'session.auto_start' su 'Off' nel file php.ini."
+msgstr "Per non avere problemi nell'uso di FusionDirectory, è necessario impostare l'opzione 'session.auto_start' su 'Off' nel file php.ini."
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"Cerca la variabile 'session.auto_start' nel file php.ini e impostala su "
-"'Off'."
+msgstr "Cerca la variabile 'session.auto_start' nel file php.ini e impostala su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:193
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr ""
-"FusionDirectory ha un bisogno minimo di 128MB di memoria. Meno di 128MB di "
-"memoria causeranno degli errori imprevisti che non saranno riproducibili ! "
-"Aumenta la memoria per delle installazioni più complesse."
+msgstr "FusionDirectory ha un bisogno minimo di 128MB di memoria. Meno di 128MB di memoria causeranno degli errori imprevisti che non saranno riproducibili ! Aumenta la memoria per delle installazioni più complesse."
 
 #: setup/class_setupStep_Checks.inc:194
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr ""
-"Cerca la variabile 'memory_limit' nel file php.ini e impostala su '128MB' o "
-"un valore più grande."
+msgstr "Cerca la variabile 'memory_limit' nel file php.ini e impostala su '128MB' o un valore più grande."
 
 #: setup/class_setupStep_Checks.inc:201
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Questa opzione influenza la gestione delle uscite. Per aumentare le "
-"prestazioni, impostala su 'Off'."
+msgstr "Questa opzione influenza la gestione delle uscite. Per aumentare le prestazioni, impostala su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr ""
-"Cerca la variabile 'implicit_flush' nel file php.ini e impostala su 'Off'."
+msgstr "Cerca la variabile 'implicit_flush' nel file php.ini e impostala su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:209
 msgid "The Execution time should be at least 30 seconds."
@@ -758,19 +684,15 @@ msgstr "Il tempo di esecuzione deve essere di almeno 30 secondi."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Cerca la variabile 'max_execution_time' nel file php.ini e impostala su '30' "
-"o un valore più grande."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Cerca la variabile 'max_execution_time' nel file php.ini e impostala su '30' o un valore più grande."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Aumenta la sicurezza del tuo server impostando la variabile 'expose_php' su "
-"'Off'. PHP non trasmetterà alcuna informazione a proposito del server che "
-"stai configurando."
+msgstr "Aumenta la sicurezza del tuo server impostando la variabile 'expose_php' su 'Off'. PHP non trasmetterà alcuna informazione a proposito del server che stai configurando."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
@@ -778,16 +700,13 @@ msgstr "Cerca la variabile 'expose_php' nel file php.ini e impostala su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Aumenta le prestazioni del tuo server impostando la variabile "
-"'magic_quotes_gpc' su 'Off'."
+msgstr "Aumenta le prestazioni del tuo server impostando la variabile 'magic_quotes_gpc' su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e "
-"impostala su 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Cerca la variabile 'zend.ze1_compatibility_mode' nel file php.ini e impostala su 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -802,10 +721,7 @@ msgstr "Il file di configurazione non puó essere scritto"
 msgid ""
 "FusionDirectory reads its configuration from a file located in (%s/%s). The "
 "setup can write the configuration directly if it is writeable."
-msgstr ""
-"FusionDirectory legge la configurazione da un file situato in (%s/%s). Il "
-"programma d'installazione scriverà direttamente nel file se questo ha le "
-"autorizzazioni per essere scritto."
+msgstr "FusionDirectory legge la configurazione da un file situato in (%s/%s). Il programma d'installazione scriverà direttamente nel file se questo ha le autorizzazioni per essere scritto."
 
 #: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
 msgid "FusionDirectory settings 2/3"
@@ -827,9 +743,7 @@ msgstr "Configurazione della connessione di LDAP"
 msgid ""
 "This dialog performs the basic configuration of the LDAP connectivity for "
 "FusionDirectory."
-msgstr ""
-"Questa finestra permette di indicare la configurazione di base di LDAP per "
-"FusionDirectory."
+msgstr "Questa finestra permette di indicare la configurazione di base di LDAP per FusionDirectory."
 
 #: setup/class_setupStep_Ldap.inc:117
 #, php-format
@@ -872,14 +786,11 @@ msgstr "Finito - Scrivi il file di configurazione"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"Il file di configurazione è attualmente accessibile in lettura a tutti. "
-"Aggiorna i permessi di accesso sul file !"
+msgstr "Il file di configurazione è attualmente accessibile in lettura a tutti. Aggiorna i permessi di accesso sul file !"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
-msgstr ""
-"Il file di configurazione attualmente non è leggibile oppure non esiste."
+msgstr "Il file di configurazione attualmente non è leggibile oppure non esiste."
 
 #: setup/class_setupStep_Finish.inc:111
 #, php-format
@@ -887,16 +798,13 @@ msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
-msgstr ""
-"Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia "
-"solo l'account abilitato al server Web a poter leggere %s, mentre gli altri "
-"account non dovrebbero."
+msgstr "Dopo aver scaricato e messo il file nella cartella %s, assicurati che sia solo l'account abilitato al server Web a poter leggere %s, mentre gli altri account non dovrebbero."
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Completato"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Successivo"
 
@@ -936,17 +844,14 @@ msgstr "L'UID di base dev'essere un valore numerico"
 
 #: setup/class_setupStep_Config1.inc:137
 msgid "The given password minimum length is not numeric."
-msgstr ""
-"La lunghezza minima per la password che hai specificato non è un valore "
-"numerico."
+msgstr "La lunghezza minima per la password che hai specificato non è un valore numerico."
 
 #: setup/class_setupStep_Config1.inc:140
 msgid "The given password differ value is not numeric."
-msgstr ""
-"L'opzione differ per la password, che hai indicato, non è un valore numerico."
+msgstr "L'opzione differ per la password, che hai indicato, non è un valore numerico."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr "Algoritmo di memorizzazione delle password"
 
@@ -954,51 +859,45 @@ msgstr "Algoritmo di memorizzazione delle password"
 msgid "Error: Password method not available!"
 msgstr "Errore: Algoritmo di memorizzazione delle password non disponibile !"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Errore fatale"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "Il file di configurazione %s/%s non è leggibile. Operazione Annullata."
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
-msgstr "Errore  di configurazione"
+msgstr "Errore di configurazione"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-"La cartella '%s' dichiarata come cartella di compilazione è inaccessibile !"
+msgstr "La cartella '%s' dichiarata come cartella di compilazione è inaccessibile !"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"Le password che hai definito come 'Nuova password' e 'Ripeti nuova password' "
-"non corrispondono."
+msgstr "Le password che hai definito come 'Nuova password' e 'Ripeti nuova password' non corrispondono."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -1006,73 +905,69 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
-msgstr "Nuova password"
+msgstr "Imposta la nuova password"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr "La password che hai definito come 'Nuova password' è troppo corta."
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "La password contiene caratteri Unicode eventualmente problematici!"
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "La sessione non sarà criptata."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Inizia una sessione SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr "Non ha trovato l'account %s"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr "Trovati più account %s"
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr "Indirizzo mail"
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr "Non c'è nessun account che usa l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr "Ci sono più account che usano l'indirizzo mail %s"
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
-msgstr ""
-"Contattare l'amministratore, c'è stato un problema con il server di posta "
-"elettronica"
+msgstr "Contattare l'amministratore, c'è stato un problema con il server di posta elettronica"
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr "Questo token non è valido"
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "Il programma esterno per cambiare la password ha rilevato un problema:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
-msgstr ""
-"Si è verificato un problema con il server mail, la email di conferma non è "
-"stata inviata"
+msgstr "Si è verificato un problema con il server mail, la email di conferma non è stata inviata"
 
 #: html/setup.php:63
 msgid "Smarty"
@@ -1081,218 +976,197 @@ msgstr "Smarty"
 #: html/main.php:136
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr ""
-"Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
+msgstr "Impossibile trovare il file '%s' - esegui '%s' per porre rimedio al problema"
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Configurazione PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr ""
-"Errore fatale: Register globals è attivato. FusionDirectory rifiuterà ogni "
-"accesso utente finchè questo errore non sarà corretto da un amministratore."
+msgstr "Errore fatale: Register globals è attivato. FusionDirectory rifiuterà ogni accesso utente finchè questo errore non sarà corretto da un amministratore."
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Modifica della password"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr "La tua password sta per scadere, per favore cambiala !"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "Fine della memoria disponibile !"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Le verifiche ACL dell'utente sono state disattivate"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Estensione"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
-msgstr ""
-"Errore fatale: Impossibile trovare alcuna definizione per il plugin "
-"'%s' ('%s' non è un file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
+msgstr "Errore fatale: Impossibile trovare alcuna definizione per il plugin '%s' ('%s' non è un file)!"
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Errore di configurazione"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"Errore fatale: non tutte le variabili POST sono state trasferite da PHP - "
-"per favore informane l'amministratore!"
+msgstr "Errore fatale: non tutte le variabili POST sono state trasferite da PHP - per favore informane l'amministratore!"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "La sessione non è criptata."
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"La durata di vita delle sessioni configurata nel tuo file fusiondirectory."
-"conf sarà rimpiazzata da quella definita nel tuo php.ini."
+msgstr "La durata di vita delle sessioni configurata nel tuo file fusiondirectory.conf sarà rimpiazzata da quella definita nel tuo php.ini."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
-msgstr ""
+msgstr "La configurazione %s/%s di FusionDirectory non è leggibile. Esegui fusiondirectory-setup --check-config per risolvere questo problema."
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Errore Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "C'è un problema con la configurazione dell'autentificazione !"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"E' impossibile trovare un utente valido per l'attuale sistema "
-"d'autenticazione !"
+msgstr "E' impossibile trovare un utente valido per l'attuale sistema d'autenticazione !"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
-msgstr ""
-"Le informazioni sull'utente non sono uniche attraverso i rami delll'annuario "
-"LDAP configurato !"
+msgstr "Le informazioni sull'utente non sono uniche attraverso i rami delll'annuario LDAP configurato !"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr "Impossibile trovare le informazioni sugli schemi LDAP installati !"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "La tua installazione LDAP contiene degli schemi ormai vecchi:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Prego specifica un nome utente valido !"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Prego specifica la tua password !"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Errore di autentificazione"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr "Impossibile trovare l'informazione utente per l'utentifica htaccess ! "
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Verifica il nome utente e la password."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Conto bloccato. Contatta l'amministratore del sistema!"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Il tuo navigatore web ha i cookies disattivati. Attiva i cookies e ricarica "
-"la pagina prima di connetterti !"
+msgstr "Il tuo navigatore web ha i cookies disattivati. Attiva i cookies e ricarica la pagina prima di connetterti !"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Informazione"
+msgstr "Informazioni sui capelli"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
-msgstr ""
+msgstr "Colore"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:45
 msgid "Color of the hair"
-msgstr ""
+msgstr "Colore dei capelli"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Sicurezza"
+msgstr "Lunghezza"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
-msgstr ""
+msgstr "Lunghezza dei capelli in centimetri"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:65
 msgid "Bicycle"
-msgstr ""
+msgstr "Bici"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:68
 msgid "Brand"
-msgstr ""
+msgstr "Marca"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:69
 msgid "Brand of the bicycle"
-msgstr ""
+msgstr "Marca della bici"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:75
 msgid "Has a bell"
-msgstr ""
+msgstr "Ha un campanello"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:76
 msgid "Does the bicycle have a bell"
-msgstr ""
+msgstr "La bici ha una campana"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Mostra/Nascondi l'informazione"
+msgstr "Informazioni FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
-#, fuzzy
 msgid "Informations for ftp login"
-msgstr "Configurazione dei plugins"
+msgstr "Informazioni per l'accesso ftp"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Nome utente"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
 msgid "Login for FTP"
-msgstr ""
+msgstr "Accesso FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1304,35 +1178,41 @@ msgid "Password"
 msgstr "Password"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Errore nella password"
+msgstr "Password FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
-msgstr ""
+msgstr "Host FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Porta"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
-msgstr ""
+msgstr "Porta FTP"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Estensione"
+msgstr "Plugin Demo"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Informazioni personali"
+msgstr "Modificare alcune informazioni personali inutili"
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1340,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Benvenuto %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Informazioni"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
-msgstr "Posta elettronica"
+msgstr "Mail"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1390,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Gruppo"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Dipartimento"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Telefono"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Applicazione"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Server"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Cliente leggero"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
-msgstr "Terminale"
+msgstr "Workstation"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1483,511 +1360,461 @@ msgstr "Configurazione"
 msgid "FusionDirectory configuration"
 msgstr "Configurazione di FusionDirectory"
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Estensioni"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr "Temi e apparenze"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Lingua"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
-msgstr ""
+msgstr "Linguaggio dell'applicazione. Se 'automatico' oppure non disponibile, verrà usato quello richiesto dal browser. Questa impostazione puó essere ridefinita per utente."
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Tema"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr "Tema da usare"
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr "Fuso orario da usare"
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr "Impostazione schema"
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
-msgstr ""
+msgstr "rfc2307bis"
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
-msgstr ""
-"Abilita lo stile di gruppi rfc2307bis. In questo caso puoi usare gli "
-"attributi dei membri al posto dei memberUid."
+msgstr "Abilita lo stile di gruppi rfc2307bis. In questo caso puoi usare gli attributi dei membri al posto dei memberUid."
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr "Verifica degli schemi LDAP"
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr "Attivare la validazione degli schemi alla connessione"
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Impostazioni per la password"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr "Algoritmo di memorizzazione delle password"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr "Algoritmo di default da usare"
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr "Forza l'algoritmo di default"
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr "Forza l'uso dell'algoritmo di default per le password"
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Lunghezza minima per le password"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr "Lunghezza minima per le password utente"
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr "Differenze minime della password"
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr "Numero minimo di caratteri diversi rispetto alla  vecchia password"
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr "Password hook"
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr "Script esterno per la gestione delle impostazioni della password"
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Utilizza una scadenza per l'account"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
-msgstr ""
-"Attiva gli attributi di test della password durante la connessione a "
-"FusionDirectory e forza il rinnovo della password oppure blocca l'account"
+msgstr "Attiva gli attributi di test della password durante la connessione a FusionDirectory e forza il rinnovo della password oppure blocca l'account"
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr "SASL Realm"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr "SASL Exop"
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr "Attributo da salvare nell'attributo userPassword"
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr "Impostazioni di base"
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "Abilita il filtro per il gruppo primario"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
-msgstr ""
-"É il tempo impiegato per valutare quali sono i gruppi primari e quali no, "
-"quindi potresti volerlo disattivare se il tuo plugin dei gruppi è molto "
-"lento."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
+msgstr "É il tempo impiegato per valutare quali sono i gruppi primari e quali no, quindi potresti volerlo disattivare se il tuo plugin dei gruppi è molto lento."
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Mostra il riepilogo negli elenchi"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
-msgstr ""
-"Determina se una barra di stato verrà visualizzata nella parte inferiore "
-"delle liste, visualizzando una breve sintesi del tipo e del numero di "
-"elementi nella lista."
-
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Onorare le entità amministrative"
+msgstr "Determina se una barra di stato verrà visualizzata nella parte inferiore delle liste, visualizzando una breve sintesi del tipo e del numero di elementi nella lista."
 
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-"Abilita le verifiche degli attributi unitTag quando si usano le unità "
-"amministrative"
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr "Blocco modifica"
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
-msgstr ""
-"Controlla se una voce attualmente in fase di modifica è stata modificata al "
-"di fuori di FusionDirectory nel frattempo."
+msgstr "Controlla se una voce attualmente in fase di modifica è stata modificata al di fuori di FusionDirectory nel frattempo."
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Attiva il copia & incolla"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
-msgstr ""
-"Abilita il copi e incolla per le voci LDAP gestite con FusionDirectory."
+msgstr "Abilita il copi e incolla per le voci LDAP gestite con FusionDirectory."
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr "Attiva il debugging"
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr "Log degli eventi dal lato di FusionDirectory."
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr "Dimensione massima dell'annuario LDAP"
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
-msgstr ""
-"Definisce il numero di voci ottenibili da LDAP come impostazione predefinita."
+msgstr "Definisce il numero di voci ottenibili da LDAP come impostazione predefinita."
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "Connessione e sessione"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Attributo di connessione"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
-msgstr ""
-"Quale attributo LDAP deve essere utilizzato come nome di login durante il "
-"login."
+msgstr "Quale attributo LDAP deve essere utilizzato come nome di login durante il login."
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Forza le connessioni criptate"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
-msgstr ""
-"Abilita i controlli di sicurezza PHP per forzare l'accesso cifrato (https) "
-"verso l'interfaccia web."
+msgstr "Abilita i controlli di sicurezza PHP per forzare l'accesso cifrato (https) verso l'interfaccia web."
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Mostra un avvertimento quando la sessione non è criptata"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
-msgstr ""
-"verrà visualizzato un avvertimento all'utente quando si utilizza http invece "
-"di https."
+msgstr "verrà visualizzato un avvertimento all'utente quando si utilizza http invece di https."
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Ricordarsi delle impostazioni dei filtri"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
-msgstr ""
-"Conserva le impostazioni del filtro e del plugin all'interno di un cookie."
+msgstr "Conserva le impostazioni del filtro e del plugin all'interno di un cookie."
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Durata di vita della sessione"
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr "Definisce, in secondi, quando una sessione scade"
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Snapshots / Annullo"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Attiva le copie istantanee"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
-msgstr ""
-"Questo abilita la possibilità di salvare alcuni stati delle entrate per "
-"poterle in seguito restaurare"
+"This enables you to save certain states of entries and restore them later "
+"on."
+msgstr "Questo abilita la possibilità di salvare alcuni stati delle entrate per poterle in seguito restaurare"
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Base per le copie istantanee"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr "La base dove gli snapshot saranno immagazzinati nell'annuario LDAP."
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr "Server degli snapshot"
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr "URI del server LDAP che sarà utilizzato per gli oggetti snapshot"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr "Nome dell'utente per gli snapshot"
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
-msgstr ""
-"L'utente usato per l'autentificazione per la connessione verso il server "
-"degli snapshot."
+msgstr "L'utente usato per l'autentificazione per la connessione verso il server degli snapshot."
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr "Password dell'utente per gli snapshot"
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
-msgstr ""
-"Le credenziali che saranno usate in abbinamento all'utente per gli snapshot, "
-"al fine dell'autentificazione"
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
+msgstr "Le credenziali che saranno usate in abbinamento all'utente per gli snapshot, al fine dell'autentificazione"
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Altro"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr "Hooks che sarà chiamato quando un'azione specificasi verifica"
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr "tab"
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr "Il tab concernente questo hook"
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr "Modalità"
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr "Quando chiamare questo comando"
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr "comando"
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr "Il comando che sarà chiamato"
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Connessioni"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr "Shell disponibili"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr "Shell POSIX disponibili per gli utenti FD"
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
-msgstr ""
-"Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i "
-"gruppi"
+msgstr "Ramo dell'annuario dove sono immagazzinate le informazioni sugli utenti e i gruppi"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "Tipo di attributo DN degli utenti"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr "Attributo da usare all'inizio del dn degli utenti"
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Includere il titolo personale nel DN dell'utente"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr "CN personalizzato"
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr "Usa un modello placeholder per generare gli account cns"
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr "Id hook successivo"
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
-msgstr ""
-"Lo script a cui fare appello per trovare il prossimo id libero per gli "
-"utenti ed i gruppi esterni"
+msgstr "Lo script a cui fare appello per trovare il prossimo id libero per gli utenti ed i gruppi esterni"
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "UIDs automatici"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr "Modalità automatica per la generazione dei nuovi ids utente"
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr "Regola di denominazione rigorosa"
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr "Attiva il controllo rigoroso degli uid e dei  nomi dei gruppi"
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr "Il più piccolo id per GID/UID"
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
-msgstr ""
-"Il più piccolo id assegnabile per un utente o un gruppo, al fine di evitare "
-"falle di sicurezza con account aventi UID 0."
+msgstr "Il più piccolo id assegnabile per un utente o un gruppo, al fine di evitare falle di sicurezza con account aventi UID 0."
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr "Numero di base per le persone"
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr "Dove cominciare a cercare un nuovo id libero per un utente."
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr "Numero di base per i gruppi"
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr "Dove cominciare a cercare un nuovo id libero per un gruppo ."
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr "RDN utenti"
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr "Il ramo dove sono immagazzinati gli utenti."
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr "RDN gruppi"
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr "Il ramo nel quale i gruppi saranno immagazzinati."
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr "Mostra gli errori"
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
-msgstr ""
-"Mosta gli errori PHP nella parte alta della schermata. Questo dovrebbe "
-"essere disabilitato nelle installazioni di produzione, a causa di possibili "
-"password che potrebbero passare in chiaro."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
+msgstr "Mosta gli errori PHP nella parte alta della schermata. Questo dovrebbe essere disabilitato nelle installazioni di produzione, a causa di possibili password che potrebbero passare in chiaro."
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Durata massima di una richiesta LDAP"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
-msgstr ""
-"Interrompi le azioni LDAP se non ci sono risposte nel tempo limite impartito "
-"in secondi."
+msgstr "Interrompi le azioni LDAP se non ci sono risposte nel tempo limite impartito in secondi."
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Inserisci le statistiche dell'annuario LDAP nel giornale di sistema"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
-msgstr ""
-"Invia le statistiche di timing LDAP al syslog. Questo può aiutare a trovare "
-"i problemi di indicizzazione o i filtri di ricerca erronei."
+msgstr "Invia le statistiche di timing LDAP al syslog. Questo può aiutare a trovare i problemi di indicizzazione o i filtri di ricerca erronei."
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Livello per il debug"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr "Mostra alcune informazioni su ogni caricamento della pagina."
 
@@ -2009,427 +1836,303 @@ msgstr "La password immessa come 'Nuova password' è vuota."
 
 #: plugins/personal/password/class_password.inc:117
 msgid "The password used as new and current are too similar."
-msgstr ""
-"La password che hai definito come 'Nuova password' è troppo simile a quella "
-"attuale."
+msgstr "La password che hai definito come 'Nuova password' è troppo simile a quella attuale."
 
 #: plugins/personal/password/class_password.inc:119
 msgid "The password used as new is to short."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
-msgstr ""
-"La verifica del blocco ha segnalato un problema: %s. La modifica della "
-"password è stata annulata !"
+msgstr "La verifica del blocco ha segnalato un problema: %s. La modifica della password è stata annulata !"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "La password immessa come 'Password attuale' è errata."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Cambia la password dell'utente"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Informazioni generali dell'utente"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Sconosciuto"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
-"Inserisci un singolo indirizzo IP oppure una combinazione network/netmask !"
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "femmina"
+#: plugins/personal/generic/class_user.inc:142
+msgid "Generic user settings"
+msgstr "Impostazioni generali per gli utenti"
+
+#: plugins/personal/generic/class_user.inc:146
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
+#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
+msgid "User"
+msgstr "Utente"
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "maschio"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Informazioni personali"
 
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Impossibile importare il file !"
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr "Cognome"
 
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
-"Il formato scelto per la memorizzazione delle password non è più "
-"disponibile. "
 
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Nome"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
-"Impossibile salvare la foto dell'utente, FusionDirectory richiede che il "
-"pacchetto 'php5-imagick' sia installato!"
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
+msgstr "Titolo personale"
+
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
+msgstr "Titolo di studio"
+
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Data di nascita"
+
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
+msgstr "Sesso"
+
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
-"Impossibile costruire l'RDN: il + non è permesso nella costruzione di sotto "
-"RDN !"
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "Non posso costruire RDN: l'attributo non è definito !"
+#: plugins/personal/generic/class_user.inc:193
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:95
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
+#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
+#: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapShotDialog.inc:230
+#: plugins/generic/references/contents.tpl.c:5
+#: plugins/admin/departments/dcObject.tpl.c:11
+#: plugins/admin/departments/locality.tpl.c:11
+#: plugins/admin/departments/country.tpl.c:11
+#: plugins/admin/departments/organization.tpl.c:11
+#: plugins/admin/departments/generic.tpl.c:11
+#: plugins/admin/departments/domain.tpl.c:11
+#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
+#: plugins/admin/ogroups/generic.tpl.c:8
+msgid "Description"
+msgstr "Descrizione"
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr "Non posso costruire RDN: i parametri dell'attributo non sono validi !"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
-"Questo metodo selezionato per le password richiede una configurazione "
-"iniziale !"
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Nome"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Nome"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Home Page"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Cellulare"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Segreteria telefonica"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Data di nascita"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Unità"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Identificativo della casa"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Professione"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Ultima consegna"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Luogo di residenza"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Descrizione dell'unità"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Area disciplinare"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Funzione"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Pubblico"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Via"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Ruolo"
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "CAP"
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/organization.tpl.c:29
+#: plugins/admin/departments/organization.tpl.c:38
+#: plugins/admin/departments/generic.tpl.c:29
+#: plugins/admin/departments/generic.tpl.c:38
+msgid "Location"
+msgstr "Località"
 
-#: plugins/personal/generic/class_user.inc:1370
-msgid "Generic user settings"
-msgstr "Impostazioni generali per gli utenti"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Regione"
 
-#: plugins/personal/generic/class_user.inc:1374
-#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
-#: plugins/admin/groups/userSelect/user-list.xml:14
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
-#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
-msgid "User"
-msgstr "Utente"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Indirizzo"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
-msgstr "Cognome"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Identifica dell'utente"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Stanza No."
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
-msgid "Personal title"
-msgstr "Titolo onorifico"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Numero dell'ufficio"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
-msgid "Academic title"
-msgstr "Titolo di studio"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
-msgid "Sex"
-msgstr "Sesso"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Lingua preferita"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Base"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Cercapersone"
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Foto personale"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Restrizioni per la connessione"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:272
 #: plugins/admin/departments/class_organizationGeneric.inc:114
 #: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:120
 #: plugins/admin/departments/dep-list.xml:47
 #: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Dipartimento No."
+
+#: plugins/personal/generic/class_user.inc:280
 msgid "Department number"
 msgstr "Numero del dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
-#: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
-#: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
-#: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
-#: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
-#: plugins/admin/departments/dcObject.tpl.c:11
-#: plugins/admin/departments/locality.tpl.c:11
-#: plugins/admin/departments/country.tpl.c:11
-#: plugins/admin/departments/organization.tpl.c:11
-#: plugins/admin/departments/generic.tpl.c:11
-#: plugins/admin/departments/domain.tpl.c:11
-#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
-#: plugins/admin/ogroups/generic.tpl.c:8
-msgid "Description"
-msgstr "Descrizione"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Matricola No."
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Matricola dell'impiegato"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Qualifica"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
 #: plugins/admin/departments/dcObject.tpl.c:20
 #: plugins/admin/departments/locality.tpl.c:20
 #: plugins/admin/departments/country.tpl.c:20
@@ -2439,369 +2142,328 @@ msgstr "Descrizione"
 msgid "Manager"
 msgstr "Manager"
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Matricola dell'impiegato"
-
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Qualifica"
-
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Numero dell'ufficio"
-
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Numero di telefono"
-
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Numero della segreteria telefonica"
-
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Numero del telefono cellulare"
-
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Numero di telefono del fax"
-
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Stato"
-
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
-#: plugins/admin/departments/organization.tpl.c:29
-#: plugins/admin/departments/organization.tpl.c:38
-#: plugins/admin/departments/generic.tpl.c:29
-#: plugins/admin/departments/generic.tpl.c:38
-msgid "Location"
-msgstr "Luogo"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Indirizzo postale"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
+#: plugins/personal/generic/class_user.inc:302
 msgid "Home postal address"
 msgstr "Indirizzo postale personale"
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Numero di telefono privato"
+
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
-msgstr "Numero di telefono personale"
+msgstr "Numero di telefono di casa"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Algoritmo per la password dell'utente"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Le entries differiscono"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
-msgstr "Scegli le entries desiderate"
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Winstation"
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminale"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "Modifica le proprietà posix"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Modifica le proprietà di posta elettronica"
+msgstr "Seleziona le entries desiderate"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Modifica le proprietà Samba"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Modifica le proprietà telefoniche"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "Menu"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Modifica le proprietà del menu avvio"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Ambiente"
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Modifica le proprietà ambientali"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Nome"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
-msgstr "Home directory"
+msgstr "Cartella personale"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr "Il path verso la cartella personale di questo utente"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr "Quale shell dovrà essere usata quando l'utente sarà connesso"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Gruppo primario"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr "Gruppo primario per questo utente"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Stato"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr "Stato di questo account utente unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Forza UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr "Forza i valori dell'UID e del GID per questo utente"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr "Valore UID per questo utente"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr "Valore GID per questo utente"
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Gruppi di appartenenza"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Account"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "L'utente dovrà cambiare la password alla prima connessione"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
-msgstr ""
-"L'utente dovrà cambiare la password alla prima connessione (lasciare vuoto "
-"per disabilitare)"
+msgstr "L'utente dovrà cambiare la password alla prima connessione (lasciare vuoto per disabilitare)"
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr "Richiamo prima del blocco della password (giorni)"
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
-msgstr ""
-"L'utente non sarà in grado di modificare la sua password dopo questo  numero "
-"di giorni (lasciare vuoto per disabilitare)"
+msgstr "L'utente non sarà in grado di modificare la sua password dopo questo  numero di giorni (lasciare vuoto per disabilitare)"
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr "Richiamo prima dell'obbligo di modifica della password (giorni)"
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
-msgstr ""
-"L'utente sarà obbligato di cambiare la sua password dopo questo numero di "
-"giorni (lasciare vuoto per disabilitare)"
+msgstr "L'utente sarà obbligato di cambiare la sua password dopo questo numero di giorni (lasciare vuoto per disabilitare)"
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr "Data di scadenza della password"
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
-msgstr ""
-"Data dopo la quale questa password utente scadrà (lasciare vuoto per "
-"disabilitare)"
+msgstr "Data dopo la quale questa password utente scadrà (lasciare vuoto per disabilitare)"
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
-msgstr ""
-"Periodo di inattività prima della disattivazione dell'account utente (giorni)"
+msgstr "Periodo di inattività prima della disattivazione dell'account utente (giorni)"
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
-msgstr ""
-"Ritardo massimo di inattività dopo la scadenza della password prima che "
-"l'utente venga disabilitato (lasciare vuoto per disabilitare)"
+msgstr "Ritardo massimo di inattività dopo la scadenza della password prima che l'utente venga disabilitato (lasciare vuoto per disabilitare)"
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr "Richiamo per l'utente prima che la password scada (giorni)"
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
-msgstr ""
-"L'utente sarà avvertito questo numero di giorni prima della scadenza della "
-"sua password (lasciare vuoto per disabilitare)"
+msgstr "L'utente sarà avvertito questo numero di giorni prima della scadenza della sua password (lasciare vuoto per disabilitare)"
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Sistema di fiducia"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Modalità di fiducia"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr "Tipo di autorizzazione per questi host"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
-msgstr "disabilitato"
+msgstr "disattivato"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "accesso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
-msgstr "permettere l'accesso  ai seguenti hosts"
+msgstr "autorizza l'accesso a questi host"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr "Consenti all'utente di connettersi solo a questo elenco di host"
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr "Unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Modifica le impostazioni POSIX dell'utente"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "non configurato"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automatico"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "Scaduto"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "Il tempo di grazia è attivo"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "Attivo"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "Password scaduta"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "Password non modificabile"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Il tempo d'attesa per il blocco è scaduto. Blocco ignorato !"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Gruppo di utenti"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2847,9 +2509,7 @@ msgstr "Stringa aleatoria per il tokens"
 msgid ""
 "Just a security measure, you can put anything in there, even random "
 "characters"
-msgstr ""
-"Solo una misura di sicurezza, potete mettere qualsiasi cosa dentro, anche "
-"dei caratteri casuali"
+msgstr "Solo una misura di sicurezza, potete mettere qualsiasi cosa dentro, anche dei caratteri casuali"
 
 #: plugins/admin/password/class_recoveryConfig.inc:84
 msgid "Allow the use of alternate addresses"
@@ -2859,9 +2519,7 @@ msgstr "Consentire l'uso di indirizzi alternativi"
 msgid ""
 "Users will also be able to enter one of theirs alternate addresses to "
 "recover their password"
-msgstr ""
-"Gli utenti possono usare uno dei loro indirizzi email alternativi per il "
-"recupero della loro password"
+msgstr "Gli utenti possono usare uno dei loro indirizzi email alternativi per il recupero della loro password"
 
 #: plugins/admin/password/class_recoveryConfig.inc:92
 msgid "First email"
@@ -2890,9 +2548,7 @@ msgstr "Corpo del messaggio (il primo %s è il login, il secondo è il link)"
 msgid ""
 "Body of the first email, sent when the user ask for a new password. Use %s "
 "for the login and the recovery link."
-msgstr ""
-"Corpo del messaggio della prima email, inviata quando l'utente chiede una "
-"nuova password. %s è usato per il login utente e il link di recupero."
+msgstr "Corpo del messaggio della prima email, inviata quando l'utente chiede una nuova password. %s è usato per il login utente e il link di recupero."
 
 #: plugins/admin/password/class_recoveryConfig.inc:106
 #, php-format
@@ -2904,14 +2560,7 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr ""
-"Salve,\n"
-"\n"
-"ecco le informazioni sul tuo account : \n"
-" - Login : %s\n"
-" - Link : %s\n"
-"\n"
-"Questo link sarà valido solo per 10 minuti."
+msgstr "Salve,\n\necco le informazioni sul tuo account : \n - Login : %s\n - Link : %s\n\nQuesto link sarà valido solo per 10 minuti."
 
 #: plugins/admin/password/class_recoveryConfig.inc:111
 msgid "Second email"
@@ -2923,8 +2572,7 @@ msgstr "Soggetto della seconda email"
 
 #: plugins/admin/password/class_recoveryConfig.inc:118
 msgid "[FusionDirectory] Password recovery successful"
-msgstr ""
-"[FusionDirectory] Il recupero della password è stato eseguito con successo"
+msgstr "[FusionDirectory] Il recupero della password è stato eseguito con successo"
 
 #: plugins/admin/password/class_recoveryConfig.inc:121
 #, php-format
@@ -2934,11 +2582,9 @@ msgstr "Corpo del messaggio (%s è il login utente)"
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
-msgstr ""
-"Corpo del messaggio della seconda email, inviata per confermare la modifica "
-"della password. %s è usato per il login dell'utente."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
+msgstr "Corpo del messaggio della seconda email, inviata per confermare la modifica della password. %s è usato per il login dell'utente."
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
 #, php-format
@@ -2947,127 +2593,107 @@ msgid ""
 "\n"
 "Your password has been changed.\n"
 "Your login is still %s."
-msgstr ""
-"Salve,\n"
-"\n"
-"La tua password è stata modificata.\n"
-"Il tuo login è sempre %s."
+msgstr "Salve,\n\nLa tua password è stata modificata.\nIl tuo login è sempre %s."
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Nome dell'organizzazione"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Categoria"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Numero di telefono"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Base"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Impostazioni amministrative"
+msgid "Postal address"
+msgstr "Indirizzo postale"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Numero di telefono"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "Oggetto di Dominio"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"Non trovo nessun tag che non sia già in uso per questa unità amministrativa !"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Etichettando '%s'"
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Continua"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Sconosciuto"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Spostare '%s' in '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Oggetto"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Impossibile copiare %s, fine dell'operazione"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Continua"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Dipartimenti"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Nome del dipartimento"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Indirizzo"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Telefono"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "L'oggetto '%s' è già etichettato"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Aggiungi l'etichetta (%s) all'oggetto '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Rimuovi l'etichetta dall'oggetto '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Dominio"
 
@@ -3084,17 +2710,17 @@ msgstr "Oggetto di Dominio"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
-msgstr "Nazione"
+msgstr "Stato"
 
 #: plugins/admin/departments/dep-list.xml:39
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Nome della località"
 
@@ -3102,24 +2728,26 @@ msgstr "Nome della località"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Azioni"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Modifica"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Nome della Nazione"
@@ -3137,11 +2765,24 @@ msgid "List of users"
 msgstr "Elenco degli utenti"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Modello"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Cognome"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Nome"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3153,7 +2794,7 @@ msgstr "Modello"
 msgid "Properties"
 msgstr "Proprietà"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Cambia la password"
@@ -3174,133 +2815,125 @@ msgstr "Applica il modello"
 msgid "New user from template"
 msgstr "Nuovo utente a partire dal modello"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Modifica utente"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "Elimina utente"
 
 #: plugins/admin/users/class_userManagement.inc:53
 msgid "Manage users"
-msgstr "Gestisci gli utenti"
+msgstr "Gestione utenti"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
-msgstr "Permesso"
+msgstr "Permessi"
 
 #: plugins/admin/users/class_userManagement.inc:391
 msgid "You have no permission to change this users password!"
 msgstr "Non hai il permesso di cambiare la password di questo/i utente/i !"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
-msgstr "Errore di permesso"
+msgstr "Errore d'autorizzazione"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Blocco dell'account"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"Il formato '%s' di memorizzazione delle password non supporta il meccanismo "
-"di bloccaggio. L'account (%s) non è statobloccato !"
+msgstr "Il formato '%s' di memorizzazione delle password non supporta il meccanismo di bloccaggio. L'account (%s) non è statobloccato !"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Sblocca l'account"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Blocca l'account"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
-msgstr ""
+msgstr "Proprietà generiche"
 
 #: plugins/admin/groups/class_group.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr "Impossibile trovare il SID del gruppo nella tua configurazione !"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Amministratori di Dominio"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Ospiti di Dominio"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Gruppo speciale (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"L'aggiunta dell'UID '%s' al gruppo '%s' non è riuscita: impossibile trovare "
-"l'oggetto utente !"
+msgstr "L'aggiunta dell'UID '%s' al gruppo '%s' non è riuscita: impossibile trovare l'oggetto utente !"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
-msgstr ""
-"L'aggiunta dell'UID '%s' al gruppo '%s' non è riuscita: l'UID è utilizzato "
-"più di una volta !"
+msgstr "L'aggiunta dell'UID '%s' al gruppo '%s' non è riuscita: l'UID è utilizzato più di una volta !"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "UID sconosciuto !"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"La ricerca ha riportato troppi risultati. Saranno mostrati solo %s "
-"risultati !"
+msgstr "La ricerca ha riportato troppi risultati. Saranno mostrati solo %s risultati !"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Impossibile trovare alcun SID per '%s' !"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Impossibile trovare alcun RIDBASE per '%s' !"
@@ -3314,23 +2947,23 @@ msgstr "Il gidNumber '%s' è già utilizzato da %s !"
 msgid "Generic group settings"
 msgstr "Impostazioni generali del gruppo"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Tipo di gruppo Samba"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Nome di dominio Samba"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Gruppo di risposta telefonica a cascata"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Gruppo Nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Membro del gruppo"
 
@@ -3358,126 +2991,167 @@ msgstr "Cancella gruppo"
 msgid "Manage groups"
 msgstr "Gestisci i gruppi"
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "Modifica le proprietà posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Modifica le proprietà di posta elettronica"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Modifica le proprietà Samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Modifica le proprietà telefoniche"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "Menu"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Modifica le proprietà del menu avvio"
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Ambiente"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Modifica le proprietà ambientali"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Seleziona un utente"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Ruoli di controllo d'accesso"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "Modifica i ruoli di controllo d'accesso (AC)"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Tutte le categorie"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Resetta le ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Un livello"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Oggetto attuale"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Sottostruttura completa"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Sottostruttura completa (permanente)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Sopra"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Sotto"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
-msgstr "Rimuovi"
+msgstr "Elimina"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "Nessuna ACL per questa categoria"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL per questi oggetti: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "Modifica la categoria di ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "Resetta la categoria di ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Modifica l'ACL per '%s', il campo di portata è '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Tutti gli oggetti nell'attuale sottostruttura"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Oggetto utilizzato"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Questo ruolo non puó essere rimosso fin quando è usato da questi oggetti :"
+msgstr "Questo ruolo non puó essere rimosso fin quando è usato da questi oggetti :"
+
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Ruolo"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Ruoli di controllo d'accesso"
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr "Ruolo ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
-msgstr "Permessi"
+msgstr "Autorizzazioni"
 
 #: plugins/admin/acl/acl-list.xml:11
 msgid "List of acls"
 msgstr "Elenco delle ACL"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "Acl"
@@ -3495,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "Modelli delle ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
 
@@ -3515,59 +3189,68 @@ msgstr "Modelli"
 msgid "Windows Install"
 msgstr "Installazione Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Coda telefonica"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminale"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Applicazioni"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Winstation"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Avvio"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Sistemi"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr "Debconf"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Sommario FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr "Cliente Argonaut"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr "OPSI"
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Coda telefonica"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Applicazioni"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Questi sistemi sono già stati configurati per altri gruppi di oggetti e non "
-"possono essere aggiunti :"
+msgstr "Questi sistemi sono già stati configurati per altri gruppi di oggetti e non possono essere aggiunti :"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3577,8 +3260,7 @@ msgstr "Informazione"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"Non puoi combinare terminali e workstations in un solo gruppo di oggetti !"
+msgstr "Non puoi combinare terminali e workstations in un solo gruppo di oggetti !"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3592,7 +3274,7 @@ msgstr "Puoi combinare solo due diversi tipi di oggetto, al massimo !"
 msgid "Object group generic"
 msgstr "Gruppo di oggetti generico"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Membro"
 
@@ -3602,7 +3284,7 @@ msgstr "Elenco di gruppi di oggetti"
 
 #: plugins/admin/ogroups/ogroup-list.xml:79
 msgid "Objectgroup"
-msgstr ""
+msgstr "Gruppo di oggetti"
 
 #: plugins/admin/ogroups/ogroup-list.xml:106
 msgid "Send message"
@@ -3621,40 +3303,34 @@ msgstr "Rimuovi gruppo di oggetti"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"Non è stata trovata nessuna estensione per inizializzare '%s', verifica il "
-"file di configurazione."
+msgstr "Non è stata trovata nessuna estensione per inizializzare '%s', verifica il file di configurazione."
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "La cancellazione è stata interrotta dall'estensione '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Riferimenti"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "Elenco ordinabile"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "nel"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "on line"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "Errore XML"
 
@@ -3698,31 +3374,29 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argomenti"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"La creazione di questa pagina, secondo l'interprete PHP, ha generato degli "
-"errori ! "
+msgstr "La creazione di questa pagina, secondo l'interprete PHP, ha generato degli errori ! "
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr "Invia i tuoi commenti a proposito di un bug al Team di FusionDirectory"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Invia un rapporto di bug"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Mostra/Nascondi l'informazione"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -3732,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Il canale richiesto non esiste! Contatta l'amministratore del sistema."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Mostra i ruoli"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
@@ -3745,106 +3419,136 @@ msgstr "Non sei autorizzato a creare una 'copia instantanea' di %s."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non sei autorizzato a restaurare una 'copia instantanea' di %s."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Gruppo di utenti"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "Nessuno"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
+msgstr "%s (necessario)"
 
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
-msgstr ""
+msgstr "Un numero intero compreso tra %d e %d"
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
-msgstr ""
+msgstr "Un numero intero più grande di %d"
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "'%s' deve essere più piccolo di %s !"
+msgstr "Un numero intero più piccolo di %d"
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
-msgstr ""
+msgstr "Un numero con la virgola compreso tra %f e %f"
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
-msgstr ""
+msgstr "Un numero con la virgola più grande di %f"
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "'%s' deve essere più piccolo di %s !"
+msgstr "Un numero con la virgola più piccolo di %f"
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
-msgstr ""
+msgstr "Errore, la dta non è corretta: "
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Impossibile importare il file !"
+msgstr "Impossibile leggere il file importato : %s"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Il certificato è vuoto !"
+msgstr "il file è vuoto"
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "Il file non è stato trovato"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "Il file non puó essere letto"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Ricarica"
+msgstr "Caricare"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Sotto"
+msgstr "Scarica"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr "Impossibile salvare la foto dell'utente, FusionDirectory richiede che il pacchetto 'php5-imagick' sia installato!"
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nome dell'oggetto"
+msgstr "Base dell'oggetto"
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
+#, php-format
 msgid "Invalid value for %s"
-msgstr "Valore UID per questo utente"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
 
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
-"La tua installazione PHP sembra non possedere la funzione mhash(). "
-"Impossibile fare l'hashing."
 
 #: include/class_msgPool.inc:43
 #, php-format
@@ -3865,7 +3569,7 @@ msgstr "Seleziona per avere la lista degli oggetti che hanno '%s' attivato"
 msgid "Select to search within subtrees"
 msgstr "Seleziona per ricercare nella sottostruttura"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Cerca nella sottostruttura"
@@ -3976,12 +3680,12 @@ msgstr "Informazioni per la connessione"
 #: include/class_msgPool.inc:220
 #, php-format
 msgid "Cannot connect to %s database!"
-msgstr "Impossibile connettersi alla base dati %s !"
+msgstr "Impossibile connettersi al database %s !"
 
 #: include/class_msgPool.inc:240
 #, php-format
 msgid "Cannot select %s database!"
-msgstr "Impossibile selezionare la base dati %s !"
+msgstr "Impossibile selezionare il database %s !"
 
 #: include/class_msgPool.inc:250
 #, php-format
@@ -3991,7 +3695,7 @@ msgstr "Nessun server %s definito !"
 #: include/class_msgPool.inc:270
 #, php-format
 msgid "Cannot query %s database!"
-msgstr "Impossibile interrogare la base dati %s !"
+msgstr "Impossibile interrogare il database %s !"
 
 #: include/class_msgPool.inc:280
 #, php-format
@@ -4001,116 +3705,113 @@ msgstr "Il campo '%s' contiene una parola chiave riservata !"
 #: include/class_msgPool.inc:292
 #, php-format
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
-msgstr ""
-"Il comando '%s', specificato come connessione dell'estensione '%s' non "
-"esiste !"
+msgstr "Il comando '%s', specificato come connessione dell'estensione '%s' non esiste !"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
-msgstr "Il comando '%s' non è valido."
-
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "L'opzione '%s' del comando (%s) per l'estensione %s non è valida !"
+msgstr "Il comando '%s' non è valido."
 
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "L'opzione '%s' del comando per l'estensione %s non è valida !"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "L'opzione '%s' del comando (%s) non è valida !"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "Impossibile eseguire il comando '%s' !"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "L'opzione '%s' del comando (%s) per l'estensione %s non è valida !"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr ""
-"Impossibile eseguire l'opzione '%s' del comando (%s) per l'estensione %s !"
+msgid "Cannot execute '%s' command!"
+msgstr "Impossibile eseguire il comando '%s' !"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Impossibile eseguire l'opzione '%s' del comando per l'estensione %s !"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Impossibile eseguire l'opzione '%s' del comando (%s) !"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Impossibile eseguire l'opzione '%s' del comando (%s) per l'estensione %s !"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Il valore specificato per '%s' è troppo grande !"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' deve essere più piccolo di %s !"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Il valore specificato per '%s' è troppo piccolo !"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' deve essere %d o un valore più grande !"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' dipende da '%s' - indica entrambi i valori !"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "C'è un'altra entry con l'attributo '%s' nel sistema !"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Il campo necessario '%s' è vuoto !"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Esempio"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Il campo '%s' contiene dei caratteri che non sono validi"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' non è permesso:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' non è permesso !"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Il campo '%s' contiene dei caratteri che non sono validi !"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
-msgstr "Estensione PHP %s  mancante !"
+msgstr "Impossibile trovare l'estensione PHP %s !"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4123,11 +3824,10 @@ msgstr "Estensione PHP %s  mancante !"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4135,319 +3835,303 @@ msgstr "Annulla"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Applica"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
-msgstr "Salva"
+msgstr "Registra"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Rimuovi %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Attiva"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Imposta %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Modifica %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Indietro"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Questa identità non possiede valide estensioni %s !"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Questa identità ha i parametri %s attivati. Puoi disattivarli cliccando sul "
-"bottone qui sotto."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Questa identità ha i parametri %s attivati. Puoi disattivarli cliccando sul bottone qui sotto."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Questa identità ha i parametri %s attivati. Per disattivarla hai bisogno di "
-"rimuovere prima di tutto i parametri %s !"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Questa identità ha i parametri %s attivati. Per disattivarla hai bisogno di rimuovere prima di tutto i parametri %s !"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Questa identità ha i parametri %s disattivati. Puoi attivarli cliccando sul "
-"bottone qui sotto."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità ha i parametri %s disattivati. Puoi attivarli cliccando sul bottone qui sotto."
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Questa identità ha i parametri %s disattivati. Per attivarli devi prima di "
-"tutto impostare i parametri %s !"
+msgstr "Questa identità ha i parametri %s disattivati. Per attivarli devi prima di tutto impostare i parametri %s !"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "Imposta i parametri %s"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "Rimuovi i parametri %s"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Click sul bottone 'Modifica' qui sotto per cambiare le informazioni di "
-"questa schermata"
+msgstr "Click sul bottone 'Modifica' qui sotto per cambiare le informazioni di questa schermata"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Gennaio"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Febbraio"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Marzo"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Aprile"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Maggio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Giugno"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Luglio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Settembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Ottobre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Novembre"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Dicembre"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Domenica"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Lunedi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Mercoledi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Giovedi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Venerdi"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Sabato"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr "L'operazione sul database è fallita!"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "operazione di lettura"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "operazione di aggiunta"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "operazione di modifica"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "operazione di rimozione"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "operazione di ricerca"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "autentificazione"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP %s è fallita!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "La richiesta inoltrata all'annuario LDAP è fallita!"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "L'invio è fallito !"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Invio fallito: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura !"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Errore di comunicazione con il servizio d'infrastruttura: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "Questo '%s' è attualmente utilizzato da questo oggetto: %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "Questo '%s' è attualmente in uso."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "Questo '%s' è attualmente utilizzato da questi oggetti: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Il file '%s' non esiste !"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Il file '%s' non puó essere aperto in lettura !"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Il file '%s' non puó essere aperto in scrittura !"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"Il valore di '%s' nno è ancora stato configurato oppure non è valido, "
-"verifica il file di configurazione !"
+msgstr "Il valore di '%s' nno è ancora stato configurato oppure non è valido, verifica il file di configurazione !"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Il file '%s' non puó essere cancellato !"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "La cartella '%s' non puó essere creata  !"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "La cartella '%s' non puó essere cancellata !"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificazione del supporto per %s"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Istalla e attiva il modulo PHP %s."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr "Installa e attiva il modulo Pear %s."
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr ""
-"Impossibile inizializzare la classe '%s' ! Forse manca un'estensione "
-"nell'installazione di FusionDirectory ?"
+msgstr "Impossibile inizializzare la classe '%s' ! Forse manca un'estensione nell'installazione di FusionDirectory ?"
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
-msgstr ""
-"La base qui fornita non è valida ed è stata reimpostata al suo valore "
-"originario !"
+msgstr "La base qui fornita non è valida ed è stata reimpostata al suo valore originario !"
 
 #: include/exporter/class_cvsExporter.inc:92
 msgid "CSV"
@@ -4459,117 +4143,111 @@ msgstr "Pagina"
 
 #: include/exporter/class_pdfExporter.inc:58
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr ""
-"L'esportazione PDF non è possibile: non ci sono librerie PDF installate."
+msgstr "L'esportazione PDF non è possibile: non ci sono librerie PDF installate."
 
 #: include/exporter/class_pdfExporter.inc:197
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "Errore di filtro"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "Il filtro non è completo!"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"Nessuna dichiarazione per '% s' nel file di configurazione. Impossibile "
-"inizializzare il plugin !"
+msgstr "Nessuna dichiarazione per '% s' nel file di configurazione. Impossibile inizializzare il plugin !"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Applica filtro"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Il certificato è vuoto !"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
-msgstr ""
-"Non posso caricare nessun certificato - solo i PEM/DER sono accettati !"
+msgstr "Non posso caricare nessun certificato - solo i PEM/DER sono accettati !"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr "Non posso estrarre informazioni da certificati che non sono PEM !"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Non ci sono certificati validi caricati !"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annulla tutto"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Incolla"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Impossibile incollare"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Errore XML nel file fusiondirectory.conf: %s alla linea %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
+msgstr "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr "Il metodo mail (classe %s) selezionato non è disponibile "
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID e/o sambaRidBase mancante nella configurazione !"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"La funzione 'copia istantanea' è attivata, ma la variabile richiesta '%s' "
-"non è configurata."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "La funzione 'copia istantanea' è attivata, ma la variabile richiesta '%s' non è configurata."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"La funzione 'copia istantanea' è attivata, ma il modulo di compressione "
-"richiesto è introvabile. Per favore installa '%s'."
+msgstr "La funzione 'copia istantanea' è attivata, ma il modulo di compressione richiesto è introvabile. Per favore installa '%s'."
+
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Tutte le categorie"
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Identità personale"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Root"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Invia"
 
@@ -4582,203 +4260,199 @@ msgstr "SASL"
 msgid "Cannot change password, unknown user '%s'"
 msgstr "Impossibile cambiare la password, '%s' utente sconosciuto"
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"Impossibile trovare un algoritmo di criptaggio che corrisponda alla password!"
+msgstr "Impossibile trovare un algoritmo di criptaggio che corrisponda alla password!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
-msgstr ""
-"L'oggetto è cambiato da quando lo hai aperto nella corrente sessione "
-"FusionDirectory. Tutte le modifiche effettuate da altri andranno perse se tu "
-"registrerai adesso!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr "L'oggetto è cambiato da quando lo hai aperto nella corrente sessione FusionDirectory. Tutte le modifiche effettuate da altri andranno perse se tu registrerai adesso!"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "Modifica del dn dell'ACL"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "da"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "Tutti gli utenti"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Azzerare ACLs"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Utilizza l'ACL definita nel ruolo"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Non ci sono impostazioni per le ACL di questa categoria !"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contiene le ACLs per questi oggetti: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "Categorie ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Modifica l'ACL per '%s' -  il campo di portata è '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Mostra/Nascondi le opzioni avanzate"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Creare degli oggetti"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Sposta degli oggetti"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Elimina degli oggetti"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Concedere l'autorizzazione al proprietario"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "lettura"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "scrittura"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "L'oggetto al completo"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Tipo '%s' di ACL sconosciuto !"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Voce '%s' sconosciuta !"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Ruolo: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "Ruolo sconosciuto"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contiene i parametri per questi oggetti: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Membri"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "disattivato"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "Non ci sono membri"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Gestire le liste di controllo degli accessi"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "Ruoli ACL"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "Creato da"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Sali di un dipartimento"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Vai agli utenti del dipartimento"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Ricarica la lista"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Copia"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Taglia"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Taglia questa voce"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Copia questa voce"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "Restaura le 'copie istantanee'"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "Lista d'esportazione"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Restaura la 'copia istantanea'"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Crea una 'copia istantanea'"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "Crea una nuova 'copia istantanea a partire da questi oggetti"
 
@@ -4801,76 +4475,65 @@ msgstr "Il tipo d'oggetto specificato è vuoto oppure non è valido !"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"Il fuso orario '%s' impostato in fusiondirectory.conf non è valido. Non è "
-"infatti possibile calcolare la differenza di fuso orario correttamente."
+msgstr "Il fuso orario '%s' impostato in fusiondirectory.conf non è valido. Non è infatti possibile calcolare la differenza di fuso orario correttamente."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Avvertimento sul rendimento"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
-msgstr ""
-"Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è durata "
-"%.2fs !"
+msgstr "Il rendimento del tuo annuario LDAP è scarso: l'ultima richiesta è durata %.2fs !"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Impossibile creare automaticamente delle sottostrutture con RDN '%s': classe "
-"di oggetto non trovata !"
+msgstr "Impossibile creare automaticamente delle sottostrutture con RDN '%s': classe di oggetto non trovata !"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr ""
-"Impossibile creare automaticamente delle sottostrutture con RDN '%s': "
-"l'operazione non è supportata"
+msgstr "Impossibile creare automaticamente delle sottostrutture con RDN '%s': l'operazione non è supportata"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "durante l'operazione su '%s' usando il server LDAP '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "durante l'operazione sul server LDAP %s"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "Il programma '%s' specificato nella linea di comando è mancante !"
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Questo non è un DN valido: '%s'. Il file da importare deve cominciare con "
-"'dn: ...' alla linea %s "
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Questo non è un DN valido: '%s'. Il file da importare deve cominciare con 'dn: ...' alla linea %s "
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Errore durante l'importazione del dn: '%s', verifica il tuo file LDIF a "
-"partire dalla linea %s !"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Errore durante l'importazione del dn: '%s', verifica il tuo file LDIF a partire dalla linea %s !"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Correggi l'errore qui sotto e ricarica la pagina."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Tutti gli oggetti in questa categoria"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr "Il formato del file di configurazione è cambiato. Istalla di nuovo !"
 
@@ -4878,251 +4541,222 @@ msgstr "Il formato del file di configurazione è cambiato. Istalla di nuovo !"
 msgid "Please activate debugging for details!"
 msgstr "Si prega di attivare il debug per i dettagli!"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Sei sul punto di cancellare la 'copia istantanea' '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Cancella la 'copia istantanea'"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Anno-mese-giorno, Ore:minuti:secondi"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Errore fatale: non è stato definito nessuno spazio per le classi - esegui "
-"'%s' per porre rimedio al problema"
+msgstr "Errore fatale: non è stato definito nessuno spazio per le classi - esegui '%s' per porre rimedio al problema"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per "
-"porre rimedio al problema"
+msgstr "Errore fatale: impossibile inizializzare la classe '%s' - esegui '%s' per porre rimedio al problema"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
+msgstr "Fatale: Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Il nome utente / UID non è univoco nel tuo annuario LDAP!"
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"Il nome utente / UID non è univoco nel tuo annuario LDAP. Contatta "
-"l'amministratore del sistema."
+msgstr "Il nome utente / UID non è univoco nel tuo annuario LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Errore all'aggiunta di un bloccaggio. Contatta i programmatori !"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta "
-"l'amministratore del sistema !"
+msgstr "Impossibile creare i dati per il bloccaggio nell'annuario LDAP. Contatta l'amministratore del sistema !"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Il server LDAP ha risposto: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. "
-"Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
+msgstr "Sono stati trovati molteplici bloccaggi per lo stesso oggetto da bloccare. Questo non dovrebbe mai succedere. Ripulire le referenze multiple."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Il valore limite dell'entries %d è stato superato !"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo "
-"stesso valore è superato"
+msgstr "Impostare il nuovo valore limite a %s et mostrare questo messaggio se lo stesso valore è superato"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Configura"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Prosegui comunque"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
-msgstr "Modifica comunque"
+msgstr "Modifica malgrado l'avvertimento"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sei sul punto di modificare la/le voce/voci %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Voci per pagina"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr ""
-"Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup --"
-"check-directories per correggerne i privilegi di accesso."
+msgstr "Il file '%s' non puó essere rimosso. Prova ad usare fusiondirectory-setup --check-directories per correggerne i privilegi di accesso."
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "Impossibile scrivere il file di revisione !"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr "Impossibile leggere il file di revisione !"
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' non è disponibile. Viene usata la base predefinita !"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "Avvertimento LDAP"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"Impossibile trovare informazioni sugli schemi a partire dal server. Nessuna "
-"verifica degli schemi è stata effettuata !"
+msgstr "Impossibile trovare informazioni sugli schemi a partire dal server. Nessuna verifica degli schemi è stata effettuata !"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Usato per memorizzare le informazioni specifiche degli account."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Usato per bloccare le entries attualmente modificate, al fine di evitare "
-"possibili cambiamenti multipli simultanei."
+msgstr "Usato per bloccare le entries attualmente modificate, al fine di evitare possibili cambiamenti multipli simultanei."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "L'oggetto di classe '%s' richiesto è mancante !"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "L'oggetto di classe '%s' opzionale è mancante !"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
-msgstr ""
-"La versione degli oggetti di classe opzionali '%s' non corrisponde (!=%s)!"
+msgstr "La versione degli oggetti di classe opzionali '%s' non corrisponde (!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(i) disponibile(i)"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Hai attivato l'opzione rfc2307bis durante la configurazione LDAP, ma la "
-"configurazione degli schemi Ldap non è compatibile con la stessa opzione."
+msgstr "Hai attivato l'opzione rfc2307bis durante la configurazione LDAP, ma la configurazione degli schemi Ldap non è compatibile con la stessa opzione."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Per poter utilizzare dei gruppi conformi alla norma rfc2307bis, "
-"l'objectClass 'posixGroup' dovrà essere AUXILIARY "
+msgstr "Per poter utilizzare dei gruppi conformi alla norma rfc2307bis, l'objectClass 'posixGroup' dovrà essere AUXILIARY "
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Il tuo schema LDAP è stato configurato per poter utilizzare i gruppi "
-"rfc2307bis, ma hai disattivato questa opzione durante la configurazione "
-"dell'annuario LDAP al momento della sua installazione."
+msgstr "Il tuo schema LDAP è stato configurato per poter utilizzare i gruppi rfc2307bis, ma hai disattivato questa opzione durante la configurazione dell'annuario LDAP al momento della sua installazione."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' deve essere STRUCTURAL"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Il comando '%s', usato nel POSTMODIFY dell'estensione '%s', non esiste !"
+msgstr "Il comando '%s', usato nel POSTMODIFY dell'estensione '%s', non esiste !"
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Impossibile assegnare un ID libero:"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "Metodo idAllocation sconosciuto !"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Impossibile creare la voce sambaUnixIdPool !"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool non è univoco !"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "nessun ID disponibile !"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "Il numero massimo di tentativi è stato superato"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "Impossibile assegnare un ID libero!"
 
@@ -5135,10 +4769,7 @@ msgid ""
 "The last interaction with the FusionDirectory web interface has been some "
 "time ago in the past. For security reasons, the session has been closed. To "
 "continue with administrative tasks, please sign in again."
-msgstr ""
-"E' passato del tempo dalla tua ultima interazione con l'interfaccia web di "
-"FusionDirectory. Per ragioni di sicurezza la sessione è stata chiusa. Se "
-"vuoi continuare nell'amministrazione, sei pregato di riconnetterti. "
+msgstr "E' passato del tempo dalla tua ultima interazione con l'interfaccia web di FusionDirectory. Per ragioni di sicurezza la sessione è stata chiusa. Se vuoi continuare nell'amministrazione, sei pregato di riconnetterti. "
 
 #: ihtml/themes/default/logout.tpl.c:8
 msgid "Sign in again"
@@ -5152,9 +4783,7 @@ msgstr "Schermata di connessione"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Usa il tuo nome utente e la tua password per accedere all'amministrazione "
-"del sistema."
+msgstr "Usa il tuo nome utente e la tua password per accedere all'amministrazione del sistema."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5187,7 +4816,6 @@ msgstr "Clicca qui per connetterti"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5197,6 +4825,7 @@ msgstr "Clicca qui per connetterti"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtro"
 
@@ -5208,23 +4837,15 @@ msgstr "Rilevato un conflitto tra diverse sessioni"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"E' stata rilevata un'altra istanza attiva della tua sessione. Le operazioni "
-"multiple sono tecnicamente impossibili e dipendono fortemente dal "
-"navigatoreweb che utilizzi. L'uso di differenti navigatori allo stesso tempo "
-"(ad esempio IE e Mozilla) è possibile. Premendo il tasto 'Termina sessione' "
-"la sessione sarà chiusa."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "E' stata rilevata un'altra istanza attiva della tua sessione. Le operazioni multiple sono tecnicamente impossibili e dipendono fortemente dal navigatoreweb che utilizzi. L'uso di differenti navigatori allo stesso tempo (ad esempio IE e Mozilla) è possibile. Premendo il tasto 'Termina sessione' la sessione sarà chiusa."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Ignorare questo messaggio causerà la modifica/perdita dei dati che stai "
-"attualmente inserendo, quindi è consigliabile chiudere tutte le finestre "
-"aperte e riconnettersi."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Ignorare questo messaggio causerà la modifica/perdita dei dati che stai attualmente inserendo, quindi è consigliabile chiudere tutte le finestre aperte e riconnettersi."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5244,8 +4865,7 @@ msgstr "Metodi disponibili"
 
 #: ihtml/themes/default/recovery.tpl.c:17
 msgid "Receive by email a link that allows you to reset your password"
-msgstr ""
-"Ricevi via e-mail un link che ti consenta di reimpostare la tua password"
+msgstr "Ricevi via e-mail un link che ti consenta di reimpostare la tua password"
 
 #: ihtml/themes/default/recovery.tpl.c:20
 msgid "Send"
@@ -5257,20 +4877,15 @@ msgstr "Clicca qui per inviare un link di ripristino della password"
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
-msgstr ""
-"Se nessuno dei metodi di cui sopra fa per te, contatta l'amministratore per "
-"cambiare la tua password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr "Se nessuno dei metodi di cui sopra fa per te, contatta l'amministratore per cambiare la tua password"
 
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Questa finestra di dialogo fornisce un modo semplice per cambiare la tua "
-"password. Immetti la nuova password (due volte) nei campi sottostanti e "
-"premi il pulsante 'Modifica'."
+msgstr "Questa finestra di dialogo fornisce un modo semplice per cambiare la tua password. Immetti la nuova password (due volte) nei campi sottostanti e premi il pulsante 'Modifica'."
 
 #: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
@@ -5282,9 +4897,9 @@ msgstr "Ripeti la nuova password"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr "Livello di sicurezza della password"
 
@@ -5316,23 +4931,18 @@ msgstr "La tua password è stata modificata."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr ""
-"Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante "
-"'Modifica'"
+msgstr "Inserisci il tuo indirizzo mail nel campo sottostante e premi il pulsante 'Modifica'"
 
 #: ihtml/themes/default/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr ""
-"=> Usa la tua e-mail nel formato lungo, ex. : John Doe => john.doe@ibcp.fr"
+msgstr "=> Usa la tua e-mail nel formato lungo, ex. : John Doe => john.doe@ibcp.fr"
 
 #: ihtml/themes/default/recovery.tpl.c:95
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr ""
-"Il recupero della password non è attivato. Se hai perso la tua password, "
-"contatta il tuo amministratore di rete."
+msgstr "Il recupero della password non è attivato. Se hai perso la tua password, contatta il tuo amministratore di rete."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:2
 msgid "Restoring object snapshots"
@@ -5342,28 +4952,20 @@ msgstr "Restaurare una 'copia instantanea'  dell'oggetto"
 msgid ""
 "This procedure will restore a snapshot of the selected object. It will "
 "replace the existing object after pressing the folder icon."
-msgstr ""
-"Questa procedura restaurerà lo snapshot dell'oggetto selezionato. L'oggetto "
-"esistente sarà rimpiazzato dopo aver premuto l'icona cartella."
+msgstr "Questa procedura restaurerà lo snapshot dell'oggetto selezionato. L'oggetto esistente sarà rimpiazzato dopo aver premuto l'icona cartella."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:8
 msgid ""
 "Remember that DNS configuration and database entries could not be restored. "
 "For some objects it is only necessary to open and save them again (goFon), "
 "but some entries must be recreated manually."
-msgstr ""
-"Ricordati che la configurazione del DNS e le voci della base dati non "
-"possono essere restaurate. Per alcuni oggetti è solo necessario aprirli et "
-"salvarli nuovamente (goFon), ma alcune voci dovranno essere ricreate "
-"manualmente."
+msgstr "Ricordati che la configurazione del DNS e le voci della base dati non possono essere restaurate. Per alcuni oggetti è solo necessario aprirli et salvarli nuovamente (goFon), ma alcune voci dovranno essere ricreate manualmente."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:11
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"Non dimenticare di verificare le relazioni tra gli oggetti, ad esempio  \"la "
-"stampanta selezionata esiste ancora?\" "
+msgstr "Non dimenticare di verificare le relazioni tra gli oggetti, ad esempio  \"la stampanta selezionata esiste ancora?\" "
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5371,9 +4973,7 @@ msgstr "Non ci sono 'copie instantanee' da restaurare"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Scegli una 'copia instantanea' e clicca sull'icona della cartella per "
-"poterla restaurare"
+msgstr "Scegli una 'copia instantanea' e clicca sull'icona della cartella per poterla restaurare"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5384,18 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Questo procedimento creerà una 'copia instantanea' dell'oggetto selezionato. "
-"Essa sarà memorizzata in un ramo speciale del tuo annuario LDAP e potrà "
-"essere restaurata in seguito."
+msgstr "Questo procedimento creerà una 'copia instantanea' dell'oggetto selezionato. Essa sarà memorizzata in un ramo speciale del tuo annuario LDAP e potrà essere restaurata in seguito."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Ricordati che le voci nelle basi dati, le configurazioni DNS e probabilmente "
-"le zone create nei servers, non saranno memorizzate nella 'copia istantanea'."
+msgstr "Ricordati che le voci nelle basi dati, le configurazioni DNS e probabilmente le zone create nei servers, non saranno memorizzate nella 'copia istantanea'."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5410,18 +5005,14 @@ msgstr "Motivo della creazione di questa 'copia instantanea'"
 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."
+msgstr "Assicurati che vuoi davvero eseguire l'azione visto che poi sarà impossibile per FusionDirectory recuperare i tuoi dati."
 
 #: ihtml/themes/default/simple-remove.tpl.c:8
 #: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+msgstr "Quindi - se sei sicuro - premi 'Rimuovi' per continuare oppure 'Annulla' per interrompere."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5432,28 +5023,19 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Se questo conflitto di chiusura è falso, è evidente che un'altra persona "
-"abbia chiuso il suo navigatore web durante un'operazione di inserimento "
-"dati. In questo caso puoi togliere il blocco premendo il tasto 'Modifica "
-"comunque'."
+msgstr "Se questo conflitto di chiusura è falso, è evidente che un'altra persona abbia chiuso il suo navigatore web durante un'operazione di inserimento dati. In questo caso puoi togliere il blocco premendo il tasto 'Modifica comunque'."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
-msgstr "Sola lettura"
+msgstr "Solo lettura"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"L'opzione \"dimensione massima\" rende les operationi LDAP più veloci e "
-"permette di alleggerire il carico di lavoro del server LDAP. La maniera più "
-"semplice di gestire enormi basi di dati senza avere lunghi tempi d'attesa è "
-"quella di limitare la ricerca a dei piccoli valori e di utilizzare i filtri "
-"per ottenere i valori ricercati."
+msgstr "L'opzione \"dimensione massima\" rende les operationi LDAP più veloci e permette di alleggerire il carico di lavoro del server LDAP. La maniera più semplice di gestire enormi basi di dati senza avere lunghi tempi d'attesa è quella di limitare la ricerca a dei piccoli valori e di utilizzare i filtri per ottenere i valori ricercati."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5467,10 +5049,7 @@ msgstr "ignora questo errore e mostra tutte le voci restituite dal server LDAP"
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"ignora questo errore e mostra tutte le voci che rientrano nel sizelimit "
-"definito e lasciami invece utilizzare i filtri per limitare i dati da "
-"visualizzare "
+msgstr "ignora questo errore e mostra tutte le voci che rientrano nel sizelimit definito e lasciami invece utilizzare i filtri per limitare i dati da visualizzare "
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5538,18 +5117,11 @@ msgstr "Connesso:"
 msgid "Session expires in %d!"
 msgstr "La sessione termina a %d!"
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "Menu principale di FusionDirectory"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Questo può essere utilizzato da diversi gruppi. Assicurati che vuoi davvero "
-"eseguire l'azione visto che poi sarà impossibile per FusionDirectory "
-"recuperare i tuoi dati."
+msgstr "Questo può essere utilizzato da diversi gruppi. Assicurati che vuoi davvero eseguire l'azione visto che poi sarà impossibile per FusionDirectory recuperare i tuoi dati."
 
 #: ihtml/themes/default/logout-close.tpl.c:2
 msgid "Your FusionDirectory session has been closed!"
@@ -5559,10 +5131,7 @@ msgstr "La tua sessione di FusionDirectory è stata chiusa!"
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Chiudi la finestra del tuo browser e vuota la cache delle password "
-"memorizzate per impedire l'autentificazione automatica a partire dal tuo "
-"browser."
+msgstr "Chiudi la finestra del tuo browser e vuota la cache delle password memorizzate per impedire l'autentificazione automatica a partire dal tuo browser."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5570,20 +5139,17 @@ msgstr "Cambia la tua password"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Questa finestra ti offre una maniera semplice di cambiare la tua password. "
-"Digita la tua password attuale ela nuova password ( due volte) nei campi "
-"sottostanti e poi premi il tasto 'modifica'."
+msgstr "Questa finestra ti offre una maniera semplice di cambiare la tua password. Digita la tua password attuale ela nuova password ( due volte) nei campi sottostanti e poi premi il tasto 'modifica'."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Password attuale"
 
@@ -5596,25 +5162,17 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr ""
-"Alcuni valori devono essere univoci nella directory completa, mentre alcune "
-"combinazioni non hanno senso. FusionDirectory mostra i valori "
-"corrispondenti. Mantieni i valori qui sotto per soddisfare i criteri di "
-"sicurezza."
+msgstr "Alcuni valori devono essere univoci nella directory completa, mentre alcune combinazioni non hanno senso. FusionDirectory mostra i valori corrispondenti. Mantieni i valori qui sotto per soddisfare i criteri di sicurezza."
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Ricorda che certe propietà, come fare una 'copia instantanea', non saranno "
-"copiate!"
+msgstr "Ricorda che certe propietà, come fare una 'copia instantanea', non saranno copiate!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr ""
-"Oppure se copi o tagli una voce con FusionDirectory e poi ne cancelli "
-"l'origine, potrai incorrere in errori tentando di incollarla di nuovo!"
+msgstr "Oppure se copi o tagli una voce con FusionDirectory e poi ne cancelli l'origine, potrai incorrere in errori tentando di incollarla di nuovo!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5673,8 +5231,7 @@ msgstr "DN dell'amministratore"
 
 #: setup/setup_ldap.tpl.c:47
 msgid "Automatically append LDAP base to admin DN"
-msgstr ""
-"Aggiunta automatica della base dell'annuario LDAP al DN dell'amministratore"
+msgstr "Aggiunta automatica della base dell'annuario LDAP al DN dell'amministratore"
 
 #: setup/setup_ldap.tpl.c:50
 msgid "Admin password"
@@ -5698,13 +5255,11 @@ msgstr "Temi e apparenze"
 
 #: setup/setup_config1.tpl.c:17
 msgid "People storage subtree"
-msgstr ""
-"Ramo dell'annuario LDAP dove sono immagazzinate le informazioni sugli utenti"
+msgstr "Ramo dell'annuario LDAP dove sono immagazzinate le informazioni sugli utenti"
 
 #: setup/setup_config1.tpl.c:20
 msgid "Group storage subtree"
-msgstr ""
-"Ramo dell'annuario LDAP dove sono immagazzinate le informazioni sui gruppi"
+msgstr "Ramo dell'annuario LDAP dove sono immagazzinate le informazioni sui gruppi"
 
 #: setup/setup_config1.tpl.c:26
 msgid "Relaxed naming policies"
@@ -5735,10 +5290,7 @@ msgid ""
 "FusionDirectory supports several encryption types for your passwords. "
 "Normally this is adjustable via user templates, but you can specify a "
 "default method to be used here, too."
-msgstr ""
-"FusionDirectory supporta diversi algoritmi di criptaggio per le password. "
-"Normalmente puoi impostarne uno attraverso i modelli per la creazione di un "
-"account, ma puoi anche impostarne uno di default qui."
+msgstr "FusionDirectory supporta diversi algoritmi di criptaggio per le password. Normalmente puoi impostarne uno attraverso i modelli per la creazione di un account, ma puoi anche impostarne uno di default qui."
 
 #: setup/setup_config1.tpl.c:68
 msgid ""
@@ -5746,45 +5298,28 @@ msgid ""
 "This is a workaround till OpenLDAP's in directory ACI's are    fully "
 "implemented. For this to work, we need the admin DN and the corresponding "
 "password."
-msgstr ""
-"FusionDirectory agisce sempre come un amministratore e gestisce i permessi "
-"di accesso (ACL) internamente. Questo è un processo utilizzato in attesa che "
-"le ACI di OpenLDAP siano totalmente implementate. Affinchè questo funzioni, "
-"devi indicare il DN dell'amministratore e la password corrispondente."
+msgstr "FusionDirectory agisce sempre come un amministratore e gestisce i permessi di accesso (ACL) internamente. Questo è un processo utilizzato in attesa che le ACI di OpenLDAP siano totalmente implementate. Affinchè questo funzioni, devi indicare il DN dell'amministratore e la password corrispondente."
 
 #: setup/setup_config1.tpl.c:71
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where "
 "FusionDirectory saves people and groups, including the way accounts get "
 "created. Check the values below if the fit your needs."
-msgstr ""
-"Alcuni parametri di base per LDAP sono modificabili e influenzano il posto "
-"in cui FusionDirectory salva le identità e i gruppi, includendo la maniera "
-"nella quale saranno creati gli accounts. Controlla che i valori seguenti "
-"corrispondano alle tue necessità."
+msgstr "Alcuni parametri di base per LDAP sono modificabili e influenzano il posto in cui FusionDirectory salva le identità e i gruppi, includendo la maniera nella quale saranno creati gli accounts. Controlla che i valori seguenti corrispondano alle tue necessità."
 
 #: setup/setup_config1.tpl.c:74
 msgid ""
 "FusionDirectory has modular support for several mail methods. These methods "
 "provide interfaces to users mailboxes and general handling    for quotas. "
 "You can choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"FusionDirectory supporta modularmente diversi metodi per l'amministrazione "
-"della posta elettronica. Questi metodi forniscono delle interfacce verso le "
-"caselle di posta elettronica degli utenti nonchè la gestione  della loro "
-"quota. Puoi impostare l'estensione 'dummy' affinchè FusionDirectory mantenga "
-"tutte le tue impostazioni inalterate."
+msgstr "FusionDirectory supporta modularmente diversi metodi per l'amministrazione della posta elettronica. Questi metodi forniscono delle interfacce verso le caselle di posta elettronica degli utenti nonchè la gestione  della loro quota. Puoi impostare l'estensione 'dummy' affinchè FusionDirectory mantenga tutte le tue impostazioni inalterate."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
-msgstr ""
-"Durante l'ispezione LDAP, analizzeremo i problemi classici che possono "
-"sopraggiungere durante la migrazione verso un sistema d'amministratione "
-"basato su FusionDirectory. Potrai correggere i seguenti errori al fine di "
-"procurarti una facile amministrazione del sistema."
+msgstr "Durante l'ispezione LDAP, analizzeremo i problemi classici che possono sopraggiungere durante la migrazione verso un sistema d'amministratione basato su FusionDirectory. Potrai correggere i seguenti errori al fine di procurarti una facile amministrazione del sistema."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -5810,7 +5345,7 @@ msgstr "Dopo la migrazione"
 
 #: setup/setup_migrate.tpl.c:20
 msgid "Close"
-msgstr "Chiudi"
+msgstr "Chiuso"
 
 #: setup/setup_migrate.tpl.c:23
 msgid "Move groups into configured group tree"
@@ -5820,20 +5355,14 @@ msgstr "Sposta i gruppi nel gruppo configurato"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Questa finestra ti permetterà di spostare un insieme di gruppi nel ramo "
-"gruppi configurato. La sua esecuzione puó migliorare le prestazioni LDAP."
+msgstr "Questa finestra ti permetterà di spostare un insieme di gruppi nel ramo gruppi configurato. La sua esecuzione puó migliorare le prestazioni LDAP."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Prudenza con questa operazione ! Possono esserci delle referenze che puntano "
-"verso questi gruppi. Il programma d'installazione di FusionDirectory non puó "
-"migrare queste referenze, magari, in questo caso, potresti voler annulare la "
-"migrazione."
+msgstr "Prudenza con questa operazione ! Possono esserci delle referenze che puntano verso questi gruppi. Il programma d'installazione di FusionDirectory non puó migrare queste referenze, magari, in questo caso, potresti voler annulare la migrazione."
 
 #: setup/setup_migrate.tpl.c:32
 msgid "Move selected groups into this group tree"
@@ -5861,20 +5390,14 @@ msgstr "Sposta gli utenti nel ramo utenti configurato nell'annuario"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Questa finestra ti permetterà di spostare un insieme di utenti nel ramo "
-"utenti configurato. La sua esecuzione puó migliorare le prestazioni LDAP."
+msgstr "Questa finestra ti permetterà di spostare un insieme di utenti nel ramo utenti configurato. La sua esecuzione puó migliorare le prestazioni LDAP."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Prudenza con questa operazione ! Possono esserci delle referenze che puntano "
-"verso questi utenti. Il programma d'installazione di FusionDirectory non puó "
-"migrare queste referenze, magari, in questo caso, potresti voler annulare la "
-"migrazione."
+msgstr "Prudenza con questa operazione ! Possono esserci delle referenze che puntano verso questi utenti. Il programma d'installazione di FusionDirectory non puó migrare queste referenze, magari, in questo caso, potresti voler annulare la migrazione."
 
 #: setup/setup_migrate.tpl.c:59
 msgid "Move selected users into this people tree"
@@ -5888,9 +5411,7 @@ msgstr "Migra gli accounts amministrativi di Gosa 2.5"
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into "
 "FusionDirectory 1.0 useable accounts."
-msgstr ""
-"Questa finestra ti permette di migrare gli accounts amministrativi di GOsa "
-"2.5 verso degli accounts FusionDirectory 1.0 utilizzabili."
+msgstr "Questa finestra ti permette di migrare gli accounts amministrativi di GOsa 2.5 verso degli accounts FusionDirectory 1.0 utilizzabili."
 
 #: setup/setup_migrate.tpl.c:107
 msgid "Abort"
@@ -5904,13 +5425,11 @@ msgstr "Crea un nuovo account amministratore di FusionDirectory"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"Questa finestra ti permette di aggiungere automaticamente un super-"
-"amministratore al tuo albero LDAP."
+msgstr "Questa finestra ti permette di aggiungere automaticamente un super-amministratore al tuo albero LDAP."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
-msgstr "ID utente"
+msgstr "ID dell'utente"
 
 #: setup/setup_migrate.tpl.c:125
 msgid "Password (again)"
@@ -5921,10 +5440,7 @@ msgid ""
 "The listed departments are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of entries, select them "
 "and use the migrate button below."
-msgstr ""
-"I dipartimenti elencati sono attualmenti invisibili nell'interfaccia utente "
-"di FusionDirectory. Se vuoi cambiare questo per un insieme di entries, "
-"selezionale e premi il bottone \"Migra\" qui sotto."
+msgstr "I dipartimenti elencati sono attualmenti invisibili nell'interfaccia utente di FusionDirectory. Se vuoi cambiare questo per un insieme di entries, selezionale e premi il bottone \"Migra\" qui sotto."
 
 #: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
 #: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
@@ -5932,56 +5448,42 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Se vuoi sapere cosa sarà fatto quando migrerai le \"entries\" selezionate, "
-"usa il bottone \"Mostra i cambiamenti\" qui sotto, per vedere il file LDIF."
+msgstr "Se vuoi sapere cosa sarà fatto quando migrerai le \"entries\" selezionate, usa il bottone \"Mostra i cambiamenti\" qui sotto, per vedere il file LDIF."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
 "The listed users are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of users, just select "
 "them and use the 'Migrate' button below."
-msgstr ""
-"Gli utenti elencati sono attualmenti invisibili nell'interfaccia utente di "
-"FusionDirectory. Se vuoi cambiare questo per un insieme di utenti, "
-"selezionali e premi il bottone \"Migra\" qui sotto."
+msgstr "Gli utenti elencati sono attualmenti invisibili nell'interfaccia utente di FusionDirectory. Se vuoi cambiare questo per un insieme di utenti, selezionali e premi il bottone \"Migra\" qui sotto."
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"Le periferiche elencate sono attualmenti invisibili nell'interfaccia utente "
-"di FusionDirectory. Se vuoi cambiare questo per un insieme di periferiche, "
-"selezionale e premi il bottone \"Migra\" qui sotto."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr "Le periferiche elencate sono attualmenti invisibili nell'interfaccia utente di FusionDirectory. Se vuoi cambiare questo per un insieme di periferiche, selezionale e premi il bottone \"Migra\" qui sotto."
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
-msgstr "Rigenera"
+msgstr "Aggiorna"
 
 #: setup/setup_migrate.tpl.c:218
 msgid ""
 "The listed services are currently invalid for the FusionDirectory version "
 "you are going to install. If you want to update a couple of service, just "
 "select them and use the 'Migrate' button below."
-msgstr ""
-"I servizi elencati non sono validi attualmente per la versione di "
-"FusionDirectory che stai installando. Se vuoi aggiornare un insieme di "
-"servizi, selezionali e premi il bottone \"Migra\" qui sotto."
+msgstr "I servizi elencati non sono validi attualmente per la versione di FusionDirectory che stai installando. Se vuoi aggiornare un insieme di servizi, selezionali e premi il bottone \"Migra\" qui sotto."
 
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"I menu elencati attualmente non sono visibili nell'interfaccia utente di "
-"FusionDirectory. Se vuoi cambiare questo per un insieme di periferiche, "
-"selezionale e premi il bottone \"Migra\" qui sotto."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr "I menu elencati attualmente non sono visibili nell'interfaccia utente di FusionDirectory. Se vuoi cambiare questo per un insieme di periferiche, selezionale e premi il bottone \"Migra\" qui sotto."
 
 #: setup/setup_feedback.tpl.c:2
 msgid "Feedback successfully send"
@@ -6001,12 +5503,9 @@ msgstr "Invia un feedback ai membri del progetto FusionDirectory"
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
-msgstr ""
-"Quando abiliti questa opzione, FusionDirectory cercherà di connettersi a "
-"http://www.fusiondirectory.org per poter sottomettere la tua domanda "
-"d'iscrizione anonimamente."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr "Quando abiliti questa opzione, FusionDirectory cercherà di connettersi a http://www.fusiondirectory.org per poter sottomettere la tua domanda d'iscrizione anonimamente."
 
 #: setup/setup_feedback.tpl.c:26
 msgid "Did the setup procedure help you to get started?"
@@ -6065,9 +5564,9 @@ msgid "What features of FusionDirectory do you use?"
 msgstr "Quali funzionalità di FusionDirectory usi ?"
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
-msgstr ""
-"Quali funzionalità vorresti avere nella futura versione di FusionDirectory ?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
+msgstr "Quali funzionalità vorresti avere nella futura versione di FusionDirectory ?"
 
 #: setup/setup_feedback.tpl.c:83
 msgid "Send feedback"
@@ -6080,12 +5579,9 @@ msgstr "Seleziona la ingua preferita"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"A questo punto, puoi scegliere la lingua di default per FusionDirectory. "
-"Scegliendo 'automatica' verrà usata la lingua richiesta dal navigatore web. "
-"Questo parametro può essere configurato dall'utente."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "A questo punto, puoi scegliere la lingua di default per FusionDirectory. Scegliendo 'automatica' verrà usata la lingua richiesta dal navigatore web. Questo parametro può essere configurato dall'utente."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -6099,27 +5595,27 @@ msgstr "Scegli il tuo fuso orario preferito"
 msgid "FusionDirectory core settings"
 msgstr "Impostazioni essenziali di FusionDirectory "
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Attivare il blocco durante la modifica"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr "FusionDirectory nel giornale di sistema"
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Forza la disattivazione della variabile 'register_globals'"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Mostra gli errori PHP"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -6140,10 +5636,7 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr ""
-"Sembra che sia la prima volta che avvii FusionDirectory - per il momento non "
-"trovo nessun file di configurazione. Questo assistente ti potrà aiutare "
-"durante la fase di configurazione."
+msgstr "Sembra che sia la prima volta che avvii FusionDirectory - per il momento non trovo nessun file di configurazione. Questo assistente ti potrà aiutare durante la fase di configurazione."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -6155,8 +5648,7 @@ msgstr "Crea una semplice configurazione mono sito"
 
 #: setup/setup_welcome.tpl.c:11
 msgid "Tries to find problems within your PHP and LDAP setup"
-msgstr ""
-"Prova a vedere se ci sono dei problemi nella configurazione di PHP o di LDAP"
+msgstr "Prova a vedere se ci sono dei problemi nella configurazione di PHP o di LDAP"
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
@@ -6188,10 +5680,7 @@ msgid ""
 "creating the file '/tmp/fusiondirectory.auth', containing the current "
 "session ID on the servers local filesystem. This can be done by executing "
 "the following command:"
-msgstr ""
-"Per ragioni di sicurezza devi autentificarti creando il file '/tmp/"
-"fusiondirectory.auth', che conterrà l'ID della sessione sul(i) server(s). "
-"Per realizzare questa azione puoi eseguire il seguente comando:"
+msgstr "Per ragioni di sicurezza devi autentificarti creando il file '/tmp/fusiondirectory.auth', che conterrà l'ID della sessione sul(i) server(s). Per realizzare questa azione puoi eseguire il seguente comando:"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
@@ -6239,20 +5728,15 @@ msgstr "Verifica dello schema non riuscita"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"Non posso leggere alcuna informazione sugli schemi, tutte le verifiche sono "
-"annullate. Correggi le ACLs dell'annuario LDAP."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "Non posso leggere alcuna informazione sugli schemi, tutte le verifiche sono annullate. Correggi le ACLs dell'annuario LDAP."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
 "It seems that your ldap database wasn't initialized yet. This might be the "
 "reason why FusionDirectory can't read your schema configuration!"
-msgstr ""
-"Sembra che il vostro annuario LDAP non sia stato ancora inizializzato. Forse "
-"è questo il motivo che non permette a Fusiondirectory di leggere la "
-"configurazione degli schemi !"
+msgstr "Sembra che il vostro annuario LDAP non sia stato ancora inizializzato. Forse è questo il motivo che non permette a Fusiondirectory di leggere la configurazione degli schemi !"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
@@ -6295,9 +5779,7 @@ msgstr "Questo oggetto non ha relazioni con altri oggetti."
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Hai cambiato con successo la tua password. Ricorda di modificare tutti i "
-"programmmi configurati per usarla."
+msgstr "Hai cambiato con successo la tua password. Ricorda di modificare tutti i programmmi configurati per usarla."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6310,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Per cambiare la tua password usa i campi qui sotto. I cambiamenti avranno "
-"effetto immediato. Memorizza la nuova password perché non sarai in grado di "
-"connetterti senza di essa."
+msgstr "Per cambiare la tua password usa i campi qui sotto. I cambiamenti avranno effetto immediato. Memorizza la nuova password perché non sarai in grado di connetterti senza di essa."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6321,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"La modifica della password influisce sull'autenticazione dei servizi di "
-"posta elettronica, proxy internet, Samba e Unix."
+msgstr "La modifica della password influisce sull'autenticazione dei servizi di posta elettronica, proxy internet, Samba e Unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "La tua password è scaduta. Scegli una nuova password !"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Ripeti la nuova password"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Finestra per la modifica della password"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "Utilizza la proposta"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "Specificare la password manualmente"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
-msgstr "Imposta password"
+msgstr "Imposta la password"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Ripulisci i campi"
 
@@ -6369,55 +5841,10 @@ msgstr "Ripulisci i campi"
 msgid "Your password hash method will not be changed!"
 msgstr "L'algoritmo della tua password non puó essere cambiato !"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificati"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Certificato standard"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Certificato S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Certificato PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Numero di serie del certificato"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Foto personale"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Elimina foto"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Impostazioni dell'utente"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Cognome"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Nome"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Rimuovi la  password"
@@ -6426,59 +5853,17 @@ msgstr "Rimuovi la  password"
 msgid "Set new password"
 msgstr "Imposta la nuova password"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Informazioni personali"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Cambia foto"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nome del modello"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Lingua preferita"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Numero di telefono privato"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Algoritmo per la password"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Restrizione d'accesso per"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "Indirizzo IP oppure network"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Informazioni organizzazione"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Dipartimento No."
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Matricola No."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Foto personale"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Stanza No."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Foto personale"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Usa la linguetta del telefono"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Elimina foto"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6495,23 +5880,6 @@ msgstr "Mostra i gruppi samba"
 msgid "Show mail groups"
 msgstr "Mostra i gruppi di posta elettronica"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Mostra servers"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Mostra workstations"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr "Mostra i PC Windows"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Mostra terminali"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6530,15 +5898,6 @@ msgstr "Nome della località da creare"
 msgid "Descriptive text for department"
 msgstr "Descrizione del dipartimento"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Etichetta il dipartimento come un'entità amministrativa indipendente"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Operazione in corso"
@@ -6547,9 +5906,7 @@ msgstr "Operazione in corso"
 msgid ""
 "Your browser doesn't support iframes, please use this link to perform the "
 "requested operation."
-msgstr ""
-"Il tuo navigatore non supporta gli iframes, usa questo link per effettuare "
-"l'operazione richiesta."
+msgstr "Il tuo navigatore web non supporta gli iframes, utilizza questo link per effettuare l'operazione richiesta."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6563,10 +5920,7 @@ msgstr "Stai attualmente spostando/rinominando questo dipartimento."
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"La modifica dell'attributo 'ou' oppure della base di un dipartimento puó "
-"corrompere le entries relative alle ACL e agli snapshots di tutti gli "
-"oggetti."
+msgstr "La modifica dell'attributo 'ou' oppure della base di un dipartimento puó corrompere le entries relative alle ACL e agli snapshots di tutti gli oggetti."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6576,9 +5930,7 @@ msgstr "FusionDirectory NON puó ancora correggere questo per te."
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Prima di confermare questa azione, verifica che tutto sarà fatto come "
-"prevedi, in ogni caso la miglior cosa sarebbe effettuare un backup."
+msgstr "Prima di confermare questa azione, verifica che tutto sarà fatto come prevedi, in ogni caso la miglior cosa sarebbe effettuare un backup."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6623,20 +5975,14 @@ msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. 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' gli account, i sistemi, etc. di questa "
-"sottostruttura. Verifica se vuoi davvero eseguire questa azione visto che "
-"poi sarà impossibile per FusionDirectory recuperare i tuoi dati."
+msgstr "Questo include 'tutti' gli account, i sistemi, etc. di questa sottostruttura. Verifica se vuoi davvero eseguire questa azione visto che poi sarà impossibile per FusionDirectory recuperare i tuoi dati."
 
 #: plugins/admin/departments/remove.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 ""
-"Fai una copia del contenuto del tuo annuario LDAP, in un file a parte, prima "
-"di eseguire questa azione. Se lo hai già fatto premi 'Cancella' per "
-"continuare, altrimenti premi 'Annulla' per interrompere l'azione. "
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6666,9 +6012,7 @@ msgstr "Applica un modello"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Applicare un modello a più utenti rimpiazzerà tutti gli attributi degli "
-"stessi utenti con quelli definiti nel modello."
+msgstr "Applicare un modello a più utenti rimpiazzerà tutti gli attributi degli stessi utenti con quelli definiti nel modello."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6683,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"La creazione di un nuovo utente puó essere facilitata attraverso l'uso dei "
-"modelli. Numerose informazioni saranno cosí riempite automaticamente. "
-"Seleziona 'alcuno' se non vuoi utilizzare i modelli."
+msgstr "La creazione di un nuovo utente puó essere facilitata attraverso l'uso dei modelli. Numerose informazioni saranno cosí riempite automaticamente. Seleziona 'alcuno' se non vuoi utilizzare i modelli."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6710,34 +6051,23 @@ msgstr "Mostra gli utenti di Samba"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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."
 
 #: plugins/admin/users/password.tpl.c:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Usa i campi qui sotto per cambiare la password degli utenti. I cambiamenti "
-"avranno effetto immediato. Memorizza la nuova password altrimenti l'utente "
-"non saprà più connettersi sensa di essa."
+msgstr "Usa i campi qui sotto per cambiare la password degli utenti. I cambiamenti avranno effetto immediato. Memorizza la nuova password altrimenti l'utente non saprà più connettersi sensa di essa."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Sicurezza"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "Finestra per l'immissione della password"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Forza la modifica della password alla prossima connessione."
 
@@ -6770,9 +6100,7 @@ msgstr "Nome Posix del gruppo"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normalmente le IDs sono autogenerate, seleziona per specificarne una "
-"manulamente"
+msgstr "Normalmente le IDs sono autogenerate, seleziona per specificarne una manulamente"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6788,10 +6116,7 @@ msgstr "Forza il numero ID"
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Questo è un gruppo principale che contiene degli utenti. Assicurati che vuoi "
-"davvero effetuare questa operazione visto che poi sarà impossibile per "
-"FusionDirectory recuperare i tuoi dati."
+msgstr "Questo è un gruppo principale che contiene degli utenti. Assicurati che vuoi davvero effetuare questa operazione visto che poi sarà impossibile per FusionDirectory recuperare i tuoi dati."
 
 #: plugins/admin/groups/trust_machines.tpl.c:2
 #: plugins/admin/ogroups/trust_machines.tpl.c:2
@@ -6813,7 +6138,7 @@ msgstr "Mostra i sistemi del dipartimento"
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:17
 #: plugins/admin/ogroups/trust_machines.tpl.c:11
 msgid "Choose the department the search will be based on"
-msgstr "Scegli il dipartimento su cui sarà basata la ricerca"
+msgstr "Scegli il dipartimento di base per la ricerca"
 
 #: plugins/admin/groups/trust_machines.tpl.c:14
 #: plugins/admin/ogroups/trust_machines.tpl.c:14
@@ -6872,8 +6197,7 @@ msgstr "Mostra gli oggetti corrispondenti"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:23
 msgid "Regular expression for matching object names"
-msgstr ""
-"Espressione regolare per selezionare i nomi degli oggetti corrispondenti"
+msgstr "Espressione regolare per trovare gli oggetti corrispondenti"
 
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:5
 msgid "Show department"
@@ -6891,6 +6215,11 @@ msgstr "Mostra il server"
 msgid "Show workstation"
 msgstr "Mostra il terminale"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr "Mostra i PC Windows"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "Mostra il terminale"
@@ -6955,11 +6284,14 @@ msgstr "Nome del gruppo"
 msgid "Member objects"
 msgstr "Oggetti membri"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Modifica multipla"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Mostra i server"
 
-#~ msgid "In all groups"
-#~ msgstr "In tutti i gruppi"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Mostra le workstations"
 
-#~ msgid "Not in all groups"
-#~ msgstr "Non in tutti i gruppi"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Mostra i terminali"
diff --git a/locale/nb/fusiondirectory.po b/locale/nb.po
similarity index 69%
rename from locale/nb/fusiondirectory.po
rename to locale/nb.po
index 1cb368a2d76a9fec0f6e3c30a9bf2df63b85fb3b..cf6791bb030d6afd10ff3a36182605983c1c5e3a 100644
--- a/locale/nb/fusiondirectory.po
+++ b/locale/nb.po
@@ -1,53 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nb\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -68,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -179,59 +178,58 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
-msgstr ""
+msgstr "Feil"
 
 #: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:525
 #, php-format
@@ -239,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -288,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Opprett"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Feil"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "LDAP-feil"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -520,13 +505,10 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Fjern"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -702,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -721,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -816,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -867,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -875,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -924,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -997,123 +978,123 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -1168,16 +1149,12 @@ msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr ""
@@ -1187,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1204,7 +1183,7 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Vert"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -1226,54 +1205,63 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
+
 #: plugins/generic/welcome/main.inc:26
 #, php-format
 msgid "Welcome %s!"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Generisk"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1282,65 +1270,62 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Tjener"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1375,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1866,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Navn"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2132,122 +1897,76 @@ msgstr ""
 msgid "User"
 msgstr "Bruker"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
-msgstr "Etternavn"
-
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
-msgid "Personal title"
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2259,66 +1978,52 @@ msgstr ""
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2326,305 +2031,438 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Navn"
+
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
@@ -2744,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2757,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
+msgid "Postal address"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2887,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr ""
 
@@ -2896,8 +2719,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2905,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Endre"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2940,11 +2765,24 @@ msgid "List of users"
 msgstr ""
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr ""
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Etternavn"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr ""
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2956,7 +2794,7 @@ msgstr ""
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr ""
@@ -2977,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -2993,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr ""
 
@@ -3010,39 +2848,39 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3050,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3109,48 +2947,94 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:23
-msgid "Group submenu entry"
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:31
-msgid "Group menu entry"
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:147
-msgid "Edit group"
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:160
-msgid "Remove group"
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
@@ -3159,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3271,7 +3151,7 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr ""
@@ -3289,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr ""
 
@@ -3309,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3383,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3414,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr ""
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr ""
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3487,29 +3374,29 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr ""
 
@@ -3524,7 +3411,7 @@ msgid "Show %s"
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3532,99 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3646,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3784,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3901,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3913,300 +3835,300 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr ""
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4227,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr ""
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr ""
 
@@ -4335,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr ""
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4552,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4615,223 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4891,7 +4816,6 @@ msgstr ""
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4901,6 +4825,7 @@ msgstr ""
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
 
@@ -4912,14 +4837,14 @@ msgstr ""
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:14
@@ -4952,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4972,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5106,9 +5031,9 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
 
@@ -5192,10 +5117,6 @@ msgstr ""
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5218,17 +5139,17 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr ""
 
@@ -5395,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5538,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5560,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5582,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5643,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5657,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5673,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5806,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5885,38 +5807,33 @@ msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr ""
 
@@ -5924,55 +5841,10 @@ msgstr ""
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr ""
@@ -5981,58 +5853,16 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
@@ -6050,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6085,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6247,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6259,15 +6063,11 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6327,7 +6127,7 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:5
 #: plugins/admin/ogroups/trust_machines.tpl.c:5
 msgid "Filters"
-msgstr ""
+msgstr "Filter"
 
 #: plugins/admin/groups/trust_machines.tpl.c:8
 #: plugins/admin/ogroups/trust_machines.tpl.c:8
@@ -6415,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6478,3 +6283,15 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/nl/fusiondirectory.po b/locale/nl.po
similarity index 65%
rename from locale/nl/fusiondirectory.po
rename to locale/nl.po
index 45b37854a2082438cf6231c47e5cfc46de4c219d..ae8fe0d38bff5666bd26345af2aa836e210105e5 100644
--- a/locale/nl/fusiondirectory.po
+++ b/locale/nl.po
@@ -1,58 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Alfred Schroeder <schroeder@GONICUS.de>, 2004
-# Cajus Pollmeier <pollmeier@gonicus.de>, 2004
-# Kenny Tordeurs <tordeurskenny@gmail.com>, 2012
-# Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:30+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/nl/)\n"
-"Language: nl\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr "FusionDirectory opties 3/3"
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr "Tweak het core gedrag van FusionDirectory"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "Nee"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Ja"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Setup error"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "Sessie levensduur moet een numerieke waarde zijn!"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "Maximum LDAP query tijd moet een numerieke waarde zijn!"
 
@@ -73,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Deze stap laat je toe om je gewenste taal te kiezen."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "LDAP inspectie"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr "Analyseer je huidige LDAP voor FusionDirectory compatibiliteit"
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Root object wordt nagekeken"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr "Inspectie van de object classes in root object"
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr "Rechten aan het nakijken voor de LDAP databank"
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Verificatie voor onzichtbare departementen"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Verificatie voor onzichtbare gebruikers"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Verificatie voor super administrator"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Verificatie voor gebruikers buiten de people tree"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Verificatie voor groepen buiten de groups tree"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Verificatie voor duplicate UID nummers"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Verificatie voor duplicate GID nummers"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr "Verificatie voor USB apparaten van oudere stijl"
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr "Verificatie voor oude diensten die moeten gemigreerd worden"
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr "Verificatie voor applicatie menu's met oude stijl"
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "LDAP query faalde"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Mogelijk ontbreekt het 'root object'."
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -184,57 +178,56 @@ msgstr "Mogelijk ontbreekt het 'root object'."
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Vond %s duplicate waarden voor het attribuut 'uidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Vond %s duplicate waarden voor het attribuut 'gidNumber'."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Vond %s groepen buiten de geconfigureerde tree '%s'."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Verplaats"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "Vond %s gebruiker(s) buiten de geconfigureerde tree '%s'."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Mislukt"
 
@@ -242,56 +235,51 @@ msgstr "Mislukt"
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-"De gespecifieerde gebruiker '%s' heeft geen volledige rechten op je ldap "
-"databank."
+msgstr "De gespecifieerde gebruiker '%s' heeft geen volledige rechten op je ldap databank."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
-msgstr ""
-"%s gebruiker(s) gevonden die niet zichtbaar zijn in FusionDirectory of die "
-"incompleet zijn."
-
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+msgstr "%s gebruiker(s) gevonden die niet zichtbaar zijn in FusionDirectory of die incompleet zijn."
+
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Migratie"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Migratie error"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Kan departement niet migreren '%s'."
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
-msgstr ""
-"Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirectory."
+msgstr "Vond %s departement(en) die niet zichtbaar zullen zijn in FusionDirectory."
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "GOsa 2.5 administratieve accounts gevonden: %s"
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
-msgstr ""
-"Er is geen geldige FusionDirectory 1.0 administrator account in je LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
+msgstr "Er is geen geldige FusionDirectory 1.0 administrator account in je LDAP."
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -299,236 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Aanmaken"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Gebruikers"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Groepen"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr "Er is geen FusionDirectory administrator account in je LDAP."
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Kan toegevoegde ACL voor gebruiker '%s' niet toevoegen:"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Input error"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Paswoord error"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "Ingevoerde paswoorden komen niet overeen!"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "Specifieer een geldige gebruikers ID!"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Fout"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"Het toevoegen van een administratieve gebruiker faalde: object '%s' bestaat "
-"al!"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "Het toevoegen van een administratieve gebruiker faalde: object '%s' bestaat al!"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "Kan gebruikers niet verplaatsen naar het gewenste departement!"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "Groep zal verplaats worden van"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "naar"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "Volgende referenties worden ook upgedate"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "Gebruiker zal verplaatst worden van"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "De volgende referenties zullen upgedate worden"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr "Het LDAP root object ontbreekt. Het is nodig voor je LDAP dienst."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Probeer het root object aan te maken"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
-msgstr ""
-"Root object kon niet aangemaakt worden, je zou het zelf kunnen proberen."
+msgstr "Root object kon niet aangemaakt worden, je zou het zelf kunnen proberen."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr "Ontbrekende FusionDirectory object class '%s'!"
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr "Kijk je installatie na aub."
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
-msgstr ""
-"Kan het structurele object type van je root object niet gebruiken. Probeer "
-"de object class '%s' manueel toe te voegen."
+msgstr "Kan het structurele object type van je root object niet gebruiken. Probeer de object class '%s' manueel toe te voegen."
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Kopiëren '%s' naar '%s' faalde:"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr "Er zijn %s apparaten die gemigreerd moeten worden."
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr "Het toevoegen van '%s' naar de LDAP faalde: %s"
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr "Updaten van '%s' faalde: %s"
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr "Er zin %s diensten die gemigreerd moeten worden"
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Toevoegen"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -536,13 +505,10 @@ msgstr "Toevoegen"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr "Er zijn %s applicaties menu's die gemigreerd moeten worden"
@@ -582,23 +548,18 @@ msgstr "Upgrade aub naar de gesupporteerde versie."
 
 #: setup/class_setupStep_Checks.inc:73
 msgid "FusionDirectory requires this module to talk with your LDAP server."
-msgstr ""
-"FusionDirectory heeft deze module nodige om te kunnen communiceren met de "
-"LDAP server."
+msgstr "FusionDirectory heeft deze module nodige om te kunnen communiceren met de LDAP server."
 
 #: setup/class_setupStep_Checks.inc:81
 msgid ""
 "FusionDirectory requires this module for an internationalized interface."
-msgstr ""
-"FusionDirectory heeft deze module nodig voor een internationale inferface."
+msgstr "FusionDirectory heeft deze module nodig voor een internationale inferface."
 
 #: setup/class_setupStep_Checks.inc:89
 msgid ""
 "FusionDirectory requires this module to communicate with different types of "
 "servers and protocols."
-msgstr ""
-"FusionDirectory heeft deze module nodig om te kunnen communiceren met "
-"verschillende types van servers en protocollen."
+msgstr "FusionDirectory heeft deze module nodig om te kunnen communiceren met verschillende types van servers en protocollen."
 
 #: setup/class_setupStep_Checks.inc:97
 msgid "FusionDirectory requires this module for the samba integration."
@@ -608,15 +569,11 @@ msgstr "FusionDirectory heeft deze module nodig voor samba integratie."
 msgid ""
 "FusionDirectory requires either 'mhash' or the 'sha1' module to make use of "
 "SSHA encryption."
-msgstr ""
-"FusionDirectory heeft of de 'mhash' of de 'sha1' module nodig om gebruik te "
-"maken van SSHA encryptie."
+msgstr "FusionDirectory heeft of de 'mhash' of de 'sha1' module nodig om gebruik te maken van SSHA encryptie."
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "FusionDirectory requires this module to talk to an IMAP server."
-msgstr ""
-"FusionDirectory heeft deze module nodig om met de IMAP server te kunnen "
-"communiceren."
+msgstr "FusionDirectory heeft deze module nodig om met de IMAP server te kunnen communiceren."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "mbstring"
@@ -624,9 +581,7 @@ msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:121
 msgid "FusionDirectory requires this module to handle unicode strings."
-msgstr ""
-"FusionDirectory heeft deze module nodig om unicode strings te kunnen "
-"behandelen."
+msgstr "FusionDirectory heeft deze module nodig om unicode strings te kunnen behandelen."
 
 #: setup/class_setupStep_Checks.inc:128
 msgid "MDB2"
@@ -636,9 +591,7 @@ msgstr "MDB2"
 msgid ""
 "FusionDirectory requires this module to communicate with several supported "
 "databases."
-msgstr ""
-"FusionDirectory heeft deze module nodig om te kunnen communiceren met "
-"verschillende gesupporteerde databanken."
+msgstr "FusionDirectory heeft deze module nodig om te kunnen communiceren met verschillende gesupporteerde databanken."
 
 #: setup/class_setupStep_Checks.inc:134
 msgid ""
@@ -652,8 +605,7 @@ msgstr "imagick"
 
 #: setup/class_setupStep_Checks.inc:139
 msgid "FusionDirectory requires this extension to handle images."
-msgstr ""
-"FusionDirectory heeft deze extensie nodig om afbeeldingen te kunnen bewerken."
+msgstr "FusionDirectory heeft deze extensie nodig om afbeeldingen te kunnen bewerken."
 
 #: setup/class_setupStep_Checks.inc:154
 msgid "compression module"
@@ -661,18 +613,14 @@ msgstr "compressie module"
 
 #: setup/class_setupStep_Checks.inc:155
 msgid "FusionDirectory requires this extension to handle snapshots."
-msgstr ""
-"FusionDirectory heeft deze extensie nodig om snapshots te kunnen behandelen."
+msgstr "FusionDirectory heeft deze extensie nodig om snapshots te kunnen behandelen."
 
 #: setup/class_setupStep_Checks.inc:166
 msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"register_globals is een PHP mechanisme om alle globale variabelen te "
-"registreren en toegankelijk te maken vanuit scripts zonder de scope te "
-"moeten aanpassen. Dit kan een veiligheidsrisico vormen. "
+msgstr "register_globals is een PHP mechanisme om alle globale variabelen te registreren en toegankelijk te maken vanuit scripts zonder de scope te moeten aanpassen. Dit kan een veiligheidsrisico vormen. "
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
@@ -680,25 +628,19 @@ msgstr "Zoek voor 'register_globals' in je php.ini en schakel het 'uit'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
-"PHP gebruikt deze waarde voor de vuilbak verzamelaar en om oude sessies te "
-"verwijderen."
+msgstr "PHP gebruikt deze waarde voor de vuilbak verzamelaar en om oude sessies te verwijderen."
 
 #: setup/class_setupStep_Checks.inc:176
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Deze waarde naar 1 dag plaatsen kan het verliezen van de sessies en "
-"cookiesdoor timeout voorkomen."
+msgstr "Deze waarde naar 1 dag plaatsen kan het verliezen van de sessies en cookiesdoor timeout voorkomen."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Zoek voor 'session.gc_maxlifetime' in je php.ini en plaats het naar 86400 of "
-"hoger."
+msgstr "Zoek voor 'session.gc_maxlifetime' in je php.ini en plaats het naar 86400 of hoger."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -709,31 +651,28 @@ msgstr "Uit"
 msgid ""
 "In Order to use FusionDirectory without any trouble, the session.auto_start "
 "option in your php.ini should be set to 'Off'."
-msgstr ""
+msgstr "Om FusionDirectory zonder problemen te kunnen gebruiken, de moet je de session.auto_start optie in je php.ini naar 'Off' wijzigen."
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"Zoek naar 'session.auto_start' in je php.ini en zet de waarde naar 'Off'."
+msgstr "Zoek naar 'session.auto_start' in je php.ini en zet de waarde naar 'Off'."
 
 #: setup/class_setupStep_Checks.inc:193
 msgid ""
 "FusionDirectory needs at least 128MB of memory. Setting it below this limit "
 "may cause errors that are not reproducable! Increase it for larger setups."
-msgstr ""
+msgstr "FusionDirectory heeft tenminste 128MB geheugen nodig. Het lager dan deze limiet plaatsen kan errors veroorzaken die niet hergeproduceerd kunnen worden! Vergroot deze waarde voor grotere installaties."
 
 #: setup/class_setupStep_Checks.inc:194
 msgid ""
 "Search for 'memory_limit' in your php.ini and set it to '128M' or higher."
-msgstr ""
+msgstr "Zoek voor 'memory_limit' in je php.ini en plaats het naar '128M' of hoger."
 
 #: setup/class_setupStep_Checks.inc:201
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Deze optie beinvloed de PHP output handling. Zet deze optie uit, om "
-"performantie te verhogen."
+msgstr "Deze optie beinvloed de PHP output handling. Zet deze optie uit, om performantie te verhogen."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
@@ -745,18 +684,15 @@ msgstr "De uitvoertijd zou minstens 30 seconden moeten zijn."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Zoek naar 'max_execution_time' in je php.ini en zet het naar '30' of hoger."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Zoek naar 'max_execution_time' in je php.ini en zet het naar '30' of hoger."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Verhoog de veiligheid van de server door de optie expose_php naar 'off' te "
-"plaatsen. PHP zal geen informatie over de server die je draait verzenden als "
-"je dit doet."
+msgstr "Verhoog de veiligheid van de server door de optie expose_php naar 'off' te plaatsen. PHP zal geen informatie over de server die je draait verzenden als je dit doet."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
@@ -764,16 +700,13 @@ msgstr "Zoek naar 'expose_php' in je php.ini en zet het naar 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Verhoog je server performantie door de optie magic_quotes_gpc naar 'off' te "
-"plaatsen."
+msgstr "Verhoog je server performantie door de optie magic_quotes_gpc naar 'off' te plaatsen."
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar "
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
 "'Off'."
+msgstr "Zoek naar 'zend.ze1_compatibility_mode' in je php.ini en plaats het naar 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -788,10 +721,7 @@ msgstr "Het configuratie bestand kan niet worden beschreven. "
 msgid ""
 "FusionDirectory reads its configuration from a file located in (%s/%s). The "
 "setup can write the configuration directly if it is writeable."
-msgstr ""
-"FusionDirectory leest zijn configuratie van een bestand dat in (%s/%s) "
-"staat. De setup kan de configuratie rechtstreeks hierin schrijven als het "
-"schrijfbaar is."
+msgstr "FusionDirectory leest zijn configuratie van een bestand dat in (%s/%s) staat. De setup kan de configuratie rechtstreeks hierin schrijven als het schrijfbaar is."
 
 #: setup/class_setupStep_Config2.inc:52 setup/class_setupStep_Config2.inc:53
 msgid "FusionDirectory settings 2/3"
@@ -813,9 +743,7 @@ msgstr "LDAP connectie setup"
 msgid ""
 "This dialog performs the basic configuration of the LDAP connectivity for "
 "FusionDirectory."
-msgstr ""
-"Deze dialoog zorgt voor de basis configuratie van de LDAP connectiviteit "
-"voor FusionDirectory."
+msgstr "Deze dialoog zorgt voor de basis configuratie van de LDAP connectiviteit voor FusionDirectory."
 
 #: setup/class_setupStep_Ldap.inc:117
 #, php-format
@@ -858,9 +786,7 @@ msgstr "Voltooid - schrijf configuratie bestand"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"Je configuratie bestand is momenteel wereldleesbaar. Update aub de "
-"bestandsrechten!"
+msgstr "Je configuratie bestand is momenteel wereldleesbaar. Update aub de bestandsrechten!"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -872,16 +798,13 @@ msgid ""
 "After downloading and placing the file under %s, please make sure that the "
 "user the webserver is running with is able to read %s, while other users "
 "shouldn't."
-msgstr ""
-"Na het downloaden en plaatsen van het bestand onder %s, verifieer aub dat de "
-"gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, "
-"terwijl andere gebruikers dit niet kunnen."
+msgstr "Na het downloaden en plaatsen van het bestand onder %s, verifieer aub dat de gebruiker die de webserver draait de mogelijkheid heeft om %s te lezen, terwijl andere gebruikers dit niet kunnen."
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Voltooid"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Volgende"
 
@@ -928,59 +851,53 @@ msgid "The given password differ value is not numeric."
 msgstr "De opgegeven waarde voor paswoord differ is niet numeriek"
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
-msgstr "Paswoord methode"
+msgstr "Wachtwoord methode"
 
 #: html/class_passwordRecovery.inc:127
 msgid "Error: Password method not available!"
 msgstr "Error. Paswoord methode niet beschikbaar!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Fatale fout"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr "FusionDirectory configuratie %s/%s is niet leesbaar. Geannuleerd."
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
-msgstr "Configuratie error"
+msgstr "Configuratie fout"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-"Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
+msgstr "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
-"overeen."
+msgstr "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar overeen."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -988,69 +905,69 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
-msgstr ""
+msgstr "Het paswoord dat gebruikt werd is te kort."
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr "Het paswoord bevat mogelijke probleemgevende Unicode karakters!"
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "De sessie zal niet versleuteld zijn."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Gebruik een SSL sessie"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr "Kon account %s niet vinden"
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr "Meerdere %s accounts gevonden"
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr "Email adres"
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr "Er is geen account dat de email %s gebruikt"
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr "Er zijn verschillende accounts die email %s gebruiken"
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr "Contacteer je systeembeheerder, er was een probleem met de mailserver"
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr "Deze token is niet geldig"
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
-msgstr ""
+msgstr "Er was een probleem met de mail server, de bevestiging werd niet verstuurd"
 
 #: html/setup.php:63
 msgid "Smarty"
@@ -1061,141 +978,131 @@ msgstr "Smarty"
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "Kan bestand '%s' niet vinden - gebruik aub '%s' om dit op te lossen"
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "PHP configuratie"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
-msgstr ""
-"Fatale error : Registreer globals in aan. FusionDirectory zal login weigeren "
-"als dit niet opgelost wordt door een admin."
+msgstr "Fatale error : Registreer globals in aan. FusionDirectory zal login weigeren als dit niet opgelost wordt door een admin."
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Paswoord wijzigen"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr "Je paswoord gaat vervallen, gelieve je paswoord te wijzigen!"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "Bijna zonder geheugen!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Gebruiker ACL verificatie is niet actief"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
-msgstr ""
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
+msgstr "Fatale error: Kan plugin definities niet vinden voor plugin '%s' ('%s' is geen bestand)!"
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Configuratie Error"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
-msgstr ""
-"Fatale error: niet alle POST variabelen zijn verplaatst naar PHP - Informeer "
-"aub je administrator!"
+msgstr "Fatale error: niet alle POST variabelen zijn verplaatst naar PHP - Informeer aub je administrator!"
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "Sessie is niet geëncrypteerd!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"De levensduur van de sessie geconfigureerd in fusiondirectory.conf zal "
-"overschreven worden door php.ini opties."
+msgstr "De levensduur van de sessie geconfigureerd in fusiondirectory.conf zal overschreven worden door php.ini opties."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Smarty error"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "Er is een probleem met de authentificatie setup!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"Kan geen geldige gebruiker vonden voor de huidige authentificatie setup!"
+msgstr "Kan geen geldige gebruiker vonden voor de huidige authentificatie setup!"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr "Gebruikersinformatie is niet uniek over de geconfigureerde LDAP trees!"
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr "Kan geen informatie vinden voor het gëinstalleerde LDAP schema!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Je LDAP setup bevat oude schema definities:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Authentificatie error"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr "Kan geen gebruikers informatie vinden voor htaccess authentificatie!"
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Accound geblokkeerd. Contacteer aub je systeembeheerder!"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en "
-"herlaad deze pagina voordat u inlogt!"
+msgstr "Cookies zijn uitgeschakeld in uw browser. Schakel cookies a.u.b. in en herlaad deze pagina voordat u inlogt!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Informatie"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1206,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Sterkte"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1235,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Informatie weergeven/verbergen"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Inlognaam"
@@ -1263,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1275,13 +1178,12 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Paswoord error"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host for FTP"
@@ -1289,21 +1191,28 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Poort"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Plugin"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Persoonlijke informatie"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1311,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Welkom %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Algemeen"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "Unix"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "E-mail"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "Ftp"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1361,65 +1270,62 @@ msgstr "Ftp"
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Afdeling"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Telefoon"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Programma"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Server"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Thin Client"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
-msgstr "Werkstation"
+msgstr "Workstation"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Objectgroep"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1435,7 +1341,7 @@ msgstr ""
 
 #: plugins/config/class_mainPluginsConfig.inc:42
 msgid "LDAP tree"
-msgstr ""
+msgstr "LDAP tree"
 
 #: plugins/config/class_mainPluginsConfig.inc:45
 msgid "OGroup RDN"
@@ -1454,469 +1360,461 @@ msgstr "Configuratie"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Plugins"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Taal"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Thema"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Paswoord opties"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Paswoord minimum lengte"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Gebruik account expiration"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr "Activeer primaire groep filter"
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Toon overzicht in lijsten"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Respecteer administratieve units"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Activeer Kopiëren & Plakken"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "Login en sessie"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Login attribuut"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Forceer gëencrypteerde connecties"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Verwittig mij als de sessie niet gëencrypteerd is"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Onthoud dialoog filter opties"
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Sessie levensduur"
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Snapshots / ongedaan maken"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Activeer snapshots"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Snaphosts basis"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Terminal Service diverse"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr "People and group opslag"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "People DN attribuut"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Inclusief personlijke titel in gebruikers DN"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr "Gecustomizeerde CN"
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "Automatische UIDs"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Debugging"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Maximum LDAP query tijd"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Log LDAP statistieken"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Debug level"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1938,276 +1836,57 @@ msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
 #: plugins/personal/password/class_password.inc:117
 msgid "The password used as new and current are too similar."
-msgstr ""
-"Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
+msgstr "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
 #: plugins/personal/password/class_password.inc:119
 msgid "The password used as new is to short."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
-msgstr ""
-"Check-hook rapporteerde een probleem: %s. Paswoord wijzigen geannuleerd!"
+msgstr "Check-hook rapporteerde een probleem: %s. Paswoord wijzigen geannuleerd!"
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
-msgstr ""
-"Het wachtwoord dat u opgegeven heeft als uw huidige wachtwoord is niet "
-"correct."
+msgstr "Het wachtwoord dat u opgegeven heeft als uw huidige wachtwoord is niet correct."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "Je hebt geen rechten om je paswoord te wijzigen."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Wijzig gebruikers paswoord"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Algemene gebruikersinformatie"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr "Voeg aub een enkel IP adres of een netwerk/netmask combinatie toe!"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "vrouw"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "man"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Kan bestand niet uploaden!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr "De geselecteerde paswoord methode is niet langer beschikbaar."
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
-"Kan gebruikersfoto niet opslaan, FusionDirectory heeft het pakket 'php5-"
-"imagick' nodig"
-
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr "Kan RDN niet bouwen: no + allowed to build sub RDN!"
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
-msgstr "Kan RDN niet bouwen: attribuut is niet gedefinieerd!"
-
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr "Kan RDN niet bouwen: ongeldige attribuut parameters!"
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
-"De geselecteerde paswoord methode heeft een initiële configuratie nodig!"
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Naam"
 
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Naam"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Homepage"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "GSM"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Pieper"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Geboortedatum"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Eenheid"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Huis identificatie"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Beroep"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Laatste levering"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Werkplaats"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Eenheid omschrijving"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Werkgebied"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Functionele titel"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Publiek zichtbaar"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Straat"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Funktie"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Postcode"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "Generieke gebruikers opties"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2218,122 +1897,76 @@ msgstr "Generieke gebruikers opties"
 msgid "User"
 msgstr "Gebruiker"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Persoonlijke informatie"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Gebruiker identificatie"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Voornaam"
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Geboortedatum"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Geslacht"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Gewenste taal"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Basis"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Persoonlijk plaatje"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr "Login restricties"
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organisatie"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Departement nummer"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2345,66 +1978,52 @@ msgstr "Departement nummer"
 msgid "Description"
 msgstr "Omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
-msgstr "Beheerder"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Werknemer nummer"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Functie"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Kamernummer"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Telefoonnummer"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Pagina nummer"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Gewenste taal"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "GSM nummer"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "FAX nummer"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Provincie"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2412,306 +2031,439 @@ msgstr "Provincie"
 msgid "Location"
 msgstr "Plaats"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Adres thuis"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Provincie"
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "Adres thuis"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Adres"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
-msgstr "Prive nummer"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
-msgstr "Gebruikers paswoord methode"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Kamer nr."
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
-msgstr "Inzendingen verschillen"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Kamernummer"
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
-msgstr "Selecteer aub de gewenste inzendingen"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Windows werkstation"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "GSM"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminal"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Pieper"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr "Wijzig posix eigenschappen"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Bewerk E-mail eigenschappen"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Bewerk Samba eigenschappen"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Bewerk telefoon eigenschappen"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Organisatie informatie"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr "Menu"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organisatie"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr "Wijzig start menu eigenschappen"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Afdeling nr."
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Omgeving"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Departement nummer"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Bewerk omgeving eigenschappen"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Personeel nr."
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Werknemer nummer"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Functie"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr "Beheerder"
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "Postadres thuis"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Telefoon privé"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr "Prive nummer"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Homepage"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Gelieve de gegevens te selecteren"
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Naam"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Primaire groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Status"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Forceer UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Groep lidmaatschap"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Account"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "Het wachtwoord moet bij de eerste aanmelding gewijzigd worden"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Vertrouwensmodus"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "volledige toegang"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Wijzig gebruikers POSIX opties"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "niet geconfigureerd"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "verlopen"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "gratie tijd actief"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "actief"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "paswoord is vervallen"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "paswoord niet wijzigbaar"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Timeout tijdens het wachten voor een lock. lock is genegeerd!"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Gebruikersgroep"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2719,7 +2471,7 @@ msgstr "Paswoord herstel"
 
 #: plugins/admin/password/class_recoveryConfig.inc:36
 msgid "Settings for the password recovery feature"
-msgstr ""
+msgstr "Instellingen voor de wachtwoord herstel feature"
 
 #: plugins/admin/password/class_recoveryConfig.inc:54
 msgid "Password recovery settings"
@@ -2727,23 +2479,23 @@ msgstr "Paswoord herstel opties"
 
 #: plugins/admin/password/class_recoveryConfig.inc:57
 msgid "Activate password recovery"
-msgstr ""
+msgstr "Activeer paswoord herstel"
 
 #: plugins/admin/password/class_recoveryConfig.inc:58
 msgid "Weither to activate or not password recovery feature"
-msgstr ""
+msgstr "Of je de paswoord herstel feature wilt activeren of niet"
 
 #: plugins/admin/password/class_recoveryConfig.inc:63
 msgid "Sender email address"
-msgstr ""
+msgstr "Zender email adres"
 
 #: plugins/admin/password/class_recoveryConfig.inc:64
 msgid "Email address from which mails will be sent"
-msgstr ""
+msgstr "Email adres van waaruit de mails zullen verzonden worden"
 
 #: plugins/admin/password/class_recoveryConfig.inc:70
 msgid "Link validity (minutes)"
-msgstr ""
+msgstr "Link geldigheid (minuten)"
 
 #: plugins/admin/password/class_recoveryConfig.inc:71
 msgid "Number of minutes before a recovery link expires"
@@ -2808,9 +2560,7 @@ msgid ""
 " - Link : %s\n"
 "\n"
 "This link is only valid for 10 minutes."
-msgstr ""
-"Hallo,⏎ ⏎ Hier is je informatie : ⏎  - Login : %s⏎  - Link : %s⏎ ⏎ Deze link "
-"is enkel geldig voor 10 minuten."
+msgstr "Hallo,⏎ ⏎ Hier is je informatie : ⏎  - Login : %s⏎  - Link : %s⏎ ⏎ Deze link is enkel geldig voor 10 minuten."
 
 #: plugins/admin/password/class_recoveryConfig.inc:111
 msgid "Second email"
@@ -2832,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2845,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr "Hallo,⏎ ⏎ Je paswoord is gewijzigd ⏎ Je login is nog steeds %s."
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Organisatienaam"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Categorie"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Telefoonnummer"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Basis"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Administratieve instellingen"
+msgid "Postal address"
+msgstr "Postadres"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Telefoonnummer"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr "Domein Component"
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "Kan geen ongebruikte tag vinden voor deze administratieve unit!"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Markeren van '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Doorgaan"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verplaatsen van %s naar %s"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Object"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Doorgaan"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Afdelingen"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Afdelingnaam"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Adres"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Object '%s' is al gemarkeerd"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Toevoegen van markering (%s) aan object '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Verwijderen van markering van object '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Domein"
 
@@ -2975,8 +2710,8 @@ msgstr "Domein component"
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Land"
 
@@ -2984,8 +2719,8 @@ msgstr "Land"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr "Localiteit"
 
@@ -2993,24 +2728,26 @@ msgstr "Localiteit"
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Acties"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Bewerken"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Landnaam"
@@ -3028,11 +2765,24 @@ msgid "List of users"
 msgstr "Lijst met gebruikers"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Sjabloon"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Achternaam"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Voornaam"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3044,7 +2794,7 @@ msgstr "Sjabloon"
 msgid "Properties"
 msgstr "Eigenschappen"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Verander wachtwoord"
@@ -3065,15 +2815,15 @@ msgstr "Template toepassen"
 msgid "New user from template"
 msgstr "Nieuwe gebruiker vanaf template"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr "Verwijder gebruiker"
 
@@ -3081,16 +2831,16 @@ msgstr "Verwijder gebruiker"
 msgid "Manage users"
 msgstr "Beheer gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr "Recht"
 
@@ -3098,41 +2848,39 @@ msgstr "Recht"
 msgid "You have no permission to change this users password!"
 msgstr "Je hebt geen rechten om deze gebruiker zijn paswoord te wijzigen!"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Account locking"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
-msgstr ""
-"Paswoord methode '%s' ondersteund geen locking. Account (%s) is niet "
-"gelocked!"
+msgstr "Paswoord methode '%s' ondersteund geen locking. Account (%s) is niet gelocked!"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Deblokkeer account"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Blokkeer account"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3140,58 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr "Kan de goep SID niet vinden in je configuratie!"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Windows beheerders"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Windows gasten"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
-msgstr ""
-"Toevoegen van UID '%s' aan groep '%s' faalde: kan gebruikersobject niet "
-"vinden!"
+msgstr "Toevoegen van UID '%s' aan groep '%s' faalde: kan gebruikersobject niet vinden!"
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
-msgstr ""
-"Toevoegen van UID '%s' aan groep '%s' faalde: UID is meer dan 1 keer "
-"gebruikt!"
+msgstr "Toevoegen van UID '%s' aan groep '%s' faalde: UID is meer dan 1 keer gebruikt!"
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr "! onbekende UID"
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"Zoek resulteerde in teveel resultaten. Er worden niet dan %s inzendingen "
-"getoond!"
+msgstr "Zoek resulteerde in teveel resultaten. Er worden niet dan %s inzendingen getoond!"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kan geen SID vinden voor '%s'!"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kan geen RIDBASE vinden voor '%s'!"
@@ -3205,23 +2947,23 @@ msgstr "De gidNumber '%s' is al in gebruik door %s!"
 msgid "Generic group settings"
 msgstr "Generieke groep opties"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Samba groep type"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Sambe domeinnaam"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Telefoon pickup groep"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Nagios groep"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Groep lid"
 
@@ -3249,118 +2991,159 @@ msgstr "Verwijder groep"
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr "Wijzig posix eigenschappen"
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Bewerk E-mail eigenschappen"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Bewerk Samba eigenschappen"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Bewerk telefoon eigenschappen"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr "Menu"
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr "Wijzig start menu eigenschappen"
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Omgeving"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Bewerk omgeving eigenschappen"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Selecteer gebruiker"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "Rechten"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Access control rollen"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "Wijzig AC rollen"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Alle categoriën"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Reset ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Eén level"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Huidig object"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Volledige subtree"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Volledige subtree (permanent)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Omhoog"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Omlaag"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "Geen ACL opties voor deze categorie"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL voor deze objecten: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "Wijzig ACL categorie"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "Reset ACL categorie"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Wijzig ACL voor '%s', scoop is '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Alle objecten in huidige subtree"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Object in gebruik"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Deze rol kan niet worden verwijderd als het in gebruik is door deze objecten:"
+msgstr "Deze rol kan niet worden verwijderd als het in gebruik is door deze objecten:"
+
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Funktie"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Access control rollen"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
-msgstr ""
+msgstr "ACL rol"
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "Rechten"
 
@@ -3368,14 +3151,14 @@ msgstr "Rechten"
 msgid "List of acls"
 msgstr "Lijst van acls"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr "Acl"
 
 #: plugins/admin/acl/class_aclManagement.inc:37
 msgid "Access control list management"
-msgstr ""
+msgstr "Access control list beheer"
 
 #: plugins/admin/acl/class_aclManagement.inc:161
 msgid "ACL Assignment"
@@ -3386,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "ACL templates"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Objectgroepen"
 
@@ -3406,59 +3189,68 @@ msgstr "Sjablonen"
 msgid "Windows Install"
 msgstr "Windows installeren"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Telefoonwachtrij"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Programma's"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Apparaten"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Opstarten"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Systemen"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "FAI samenvatting"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr "Argonaut client"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Telefoonwachtrij"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Programma's"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
-msgstr ""
-"Deze systemen zijn al geconfigureerd door andere object groepen en kan niet "
-"worden toegevoegd:"
+msgstr "Deze systemen zijn al geconfigureerd door andere object groepen en kan niet worden toegevoegd:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 #: ihtml/themes/default/msg_dialog.tpl.c:8
@@ -3482,7 +3274,7 @@ msgstr "Je kan maximum 2 verschillende object types combineren!"
 msgid "Object group generic"
 msgstr "Object groep generiek"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Lid"
 
@@ -3511,40 +3303,34 @@ msgstr "Verwijder object groep"
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
-msgstr ""
-"Geen plugin definities gevonden om '%s' te initializeren, verifieer aub je "
-"configuratie bestand."
+msgstr "Geen plugin definities gevonden om '%s' te initializeren, verifieer aub je configuratie bestand."
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Referenties"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr "Sorteerbare lijst"
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "in"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr "op lijn"
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr "XML error"
 
@@ -3588,46 +3374,44 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
+msgstr "Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr "Stuur probleemrapport naar het FusionDirectory Teal"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Stuur probleemrapport"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Informatie weergeven/verbergen"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Interne error"
 
 #: include/class_session.inc:100 include/class_session.inc:137
 #: include/class_session.inc:175
 msgid "Requested channel does not exist! Please contact your Administrator."
-msgstr ""
-"Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
+msgstr "Gevraagde kanaal bestaat niet! Gelieve je Systeembeheerder te contacteren."
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Toon rollen"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Je hebt geen toelating om een snapshot te maken voor %s."
@@ -3635,103 +3419,135 @@ msgstr "Je hebt geen toelating om een snapshot te maken voor %s."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Je hebt geen toelating om een snapshot voor %s te restaureren."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Gebruikersgroep"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr "Geen"
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:944
+#, php-format
 msgid "An integer smaller than %d"
-msgstr "'%s' moet kleiner zijn dan %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1031
+#, php-format
 msgid "A float smaller than %f"
-msgstr "'%s' moet kleiner zijn dan %s!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Kan bestand niet uploaden!"
+msgstr "Kan geupload bestand niet lezen: %s"
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Certificaat is leeg!"
+msgstr "bestand is leeg"
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
-msgstr ""
+msgstr "bestand niet gevonden"
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
-msgstr ""
+msgstr "bestand onleesbaar"
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Herstart"
+msgstr "Uploaden"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Omlaag"
+msgstr "Downloaden"
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr "Kan gebruikersfoto niet opslaan, FusionDirectory heeft het pakket 'php5-imagick' nodig"
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Objectnaam"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3753,7 +3569,7 @@ msgstr "Selecteer om objecten te tonen die '%s' actief hebben"
 msgid "Select to search within subtrees"
 msgstr "Selecteer om binnen subonderdelen te zoeken"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Zoek in subtrees"
@@ -3891,111 +3707,111 @@ msgstr "Het veld '%s' bevat een gereserveerd keyword!"
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "Commando gespecifieerd als %s hook voor plugin '%s' bestaat niet!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
-msgstr "'%s' commando is niet geldig!"
-
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "'%s' commando (%s) voor plugin %s is niet geldig!"
+msgstr "'%s' commando is niet geldig!"
 
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "'%s' commando voor plugin %s is niet geldig!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "'%s' commando (%s) is niet geldig!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "Kan '%s' commando niet uitvoeren!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "'%s' commando (%s) voor plugin %s is niet geldig!"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Kan '%s' commando (%s) voor plugin %s niet uitvoeren!"
+msgid "Cannot execute '%s' command!"
+msgstr "Kan '%s' commando niet uitvoeren!"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Kan '%s' commando voor plugin %s niet uitvoeren!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Kan '%s' commando (%s) niet uitvoeren!"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Kan '%s' commando (%s) voor plugin %s niet uitvoeren!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Waarde voor '%s' is te groot!"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "'%s' moet kleiner zijn dan %s!"
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Waarde voor '%s' is te klein!"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' moet %d zijn of hoger!"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' hangt af van '%s' - geef aub beidde waarden in!"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Er is al een inzending met dit '%s' attribuut in het systeem!"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Het vereiste veld '%s' is leeg!"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Voorbeeld"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Het veld '%s' bevat ongeldige karakters"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' is niet toegelaten:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' zijn niet toegelaten!"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Het veld '%s' bevat ongeldige karakters!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "%s PHP extensie ontbreekt!"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -4008,11 +3824,10 @@ msgstr "%s PHP extensie ontbreekt!"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -4020,318 +3835,303 @@ msgstr "Annuleren"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Toepassen"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Opslaan"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Voeg %s toe"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Verwijder %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Stel in"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Stel %s in"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Wijzig..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Wijzig %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Terug"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "De account heeft geen geldige %s extensies!"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Deze account heeft %s opties actief. Je kan deze desactiveren door op ze te "
-"klikken hieronder."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Deze account heeft %s opties actief. Je kan deze desactiveren door op ze te klikken hieronder."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Deze account heeft %s opties actief. Om ze te desactiveren, zal je de %s "
-"opties eerst moeten verwijderen!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Deze account heeft %s opties actief. Om ze te desactiveren, zal je de %s opties eerst moeten verwijderen!"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Deze account heeft %s opties op non-actief. Om ze te activeren kan je "
-"hieronder op ze klikken."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Deze account heeft %s opties op non-actief. Om ze te activeren kan je hieronder op ze klikken."
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Deze account heeft %s opties op non-actief. Om ze te activeren moet je de %s "
-"opties eerst toevoegen!"
+msgstr "Deze account heeft %s opties op non-actief. Om ze te activeren moet je de %s opties eerst toevoegen!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "Voeg %s opties toe"
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "Verwijder %s opties"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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"
+msgstr "Gebruik de 'Bewerk' knop hieronder om de informatie in deze dialoog te veranderen"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Januari"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Februari"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Maart"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "April"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Mei"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Juni"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Juli"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Augustus"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "September"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Oktober"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "November"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "December"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Zondag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Maandag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr "Databank operatie faalde!"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "lees operatie"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "voeg operatie toe"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "wijzig operatie"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "verwijder operatie"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "zoek operatie"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "authentificatie"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s faalde!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "LDAP operaite faalde!"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "Upload faalde!"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Upload faalde: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Communicatie met de infrastructuur dienst faalde!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Communicatie met de infrastructuur dienst faalde: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "De '%s' is nog steeds in gebruik door dit object: %s"
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "De '%s' is nog steeds in gebruik."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "De '%s' is nog steeds in gebruik door deze objecten: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Bestand '%s' bestaat niet!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Kan bestand '%s' niet openen om te lezen!"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Kan bestand '%s' niet openen om te schrijven!"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
-msgstr ""
-"De waarde voor '%s' is momenteel niet geconfigureerd of niet geldig, "
-"verifieer aub je configuratie bestand!"
+msgstr "De waarde voor '%s' is momenteel niet geconfigureerd of niet geldig, verifieer aub je configuratie bestand!"
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Kan bestand '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Kan folder '%s' niet maken!"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Kan folder '%s' niet verwijderen!"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Verificatie voor %s support"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Installeer en activeer de %s PHP module."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
-msgstr ""
+msgstr "Installeer en activeer de %s Pear module."
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
-msgstr ""
-"Kan class '%s' niet initializeren! Misschien ontbreekt er een plugin in je "
-"FusionDirectory setup?"
+msgstr "Kan class '%s' niet initializeren! Misschien ontbreekt er een plugin in je FusionDirectory setup?"
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
-msgstr ""
-"De opgegeven base is niet geldig en is veranderd naar de vorige waarde!"
+msgstr "De opgegeven base is niet geldig en is veranderd naar de vorige waarde!"
 
 #: include/exporter/class_cvsExporter.inc:92
 msgid "CSV"
@@ -4349,108 +4149,105 @@ msgstr "Geen PDF export mogelijk: Er is geen FPDF library geinstalleerd."
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr "Filter error"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr "De filter is niet volledig!"
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
-msgstr ""
-"Geen tab declaratie voor '%s' gevonden in je configuratie bestand. Kan "
-"plugin instantie niet aanmaken!"
+msgstr "Geen tab declaratie voor '%s' gevonden in je configuratie bestand. Kan plugin instantie niet aanmaken!"
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Certificaat is leeg!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr "Kan certificaat niet laden - enkel PEM/DER is ondersteund!"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr "Kan geen informatie van niet PEM certificaten uithalen!"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Geen geldig certificaat geladen!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Annuleer alles"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Kan niet plakken"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML fout in fusiondirectory.conf: %s op regel %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Kan niet binden met de LDAP. Gelie je systeembeheerder te contacteren."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
-msgstr ""
+msgstr "De geselecteerde mail methode (class %s) is niet beschikbaar"
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID en/of sambaRidBase ontbreken in de configuratie!"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"De snapshot functionaliteit is aan, maar de vereiste variabele '%s' is niet "
-"ingesteld."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "De snapshot functionaliteit is aan, maar de vereiste variabele '%s' is niet ingesteld."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
-msgstr ""
-"De snapshot funcionaliteit is geactiveerd, maar de vereiste compressie "
-"module ontbreekt. Installeer aub '%s'."
+msgstr "De snapshot funcionaliteit is geactiveerd, maar de vereiste compressie module ontbreekt. Installeer aub '%s'."
+
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Alle categoriën"
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Mijn account"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Verwerk"
 
@@ -4461,204 +4258,201 @@ msgstr "SASL"
 #: include/password-methods/class_password-methods-sasl.inc:63
 #, php-format
 msgid "Cannot change password, unknown user '%s'"
-msgstr ""
+msgstr "Kan wachtwoord niet wijzigen, onbekende gebruiker '%s'"
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr "Kan geen geschikte paswoord methode vinden voor de huidige hash!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
-msgstr ""
-"Het object is gewijzigd sinds het openen van FusionDirectory. Alle "
-"wijzigingen die gemaakt zijn door anderen zullen verloren gaan als je deze "
-"inzending opslaat!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
+msgstr "Het object is gewijzigd sinds het openen van FusionDirectory. Alle wijzigingen die gemaakt zijn door anderen zullen verloren gaan als je deze inzending opslaat!"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "ACL dn wijzigen"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "van"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr "Alle gebruikers"
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Reset ACLs"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Gebruik ACL gedefinieerd in een rol"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Geen ACL opties voor deze categorie!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Bevat ACLs voor deze objecten: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "categorie ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Wijzig ACL voor '%s' - scoop is '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Toon/verberg geavanceerde opties"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Maak objecten"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Verplaats objecten"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Verwijder objecten"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Rechten toekennen aan eigenaar"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "alleen lezen"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "afleveren, lezen & schrijven"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "Volledig object"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Onbekend ACL type '%s'!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Onbekende inzending '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Rol: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "onbekende rol"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Bevat opties voor deze objecten: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Groepsleden"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "non-actief"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr "Geen leden"
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Beheer access control lists"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "ACL rollen"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Selecteer alles"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "aangemaakt door"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Home"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Kopieer"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Knip"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr "Restaureer snapshots"
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr "Export lijst"
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Restaureer snapshot"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Maak snapshot"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "Maak een nieuw snapshot van dit object"
 
@@ -4681,72 +4475,65 @@ msgstr "Gespecifieerd objectType is leeg of ongeldig!"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"De tijdzone optie '%s' in je fusiondirectory.conf is niet geldig. Kan "
-"correcte tijdzone niet berekenen."
+msgstr "De tijdzone optie '%s' in je fusiondirectory.conf is niet geldig. Kan correcte tijdzone niet berekenen."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Performantie waarschuwing"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "LDAP performantie is slecht: laatste query duurde ongeveer %.2fs!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Kan niet automatisch subtrees aanmaken met RDN '%s': geen object class "
-"gevonden!"
+msgstr "Kan niet automatisch subtrees aanmaken met RDN '%s': geen object class gevonden!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr "Kan niet automatisch subtrees aanmaken met RDN '%s': niet ondersteund"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "bij het bewerken van '%s' op LDAP server '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr "Command line program '%s' ontbreekt! "
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
-"beginnen met 'dn: ...' op regel %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te beginnen met 'dn: ...' op regel %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
-"vanaf regel %s!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. vanaf regel %s!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Los aub de bovenstaande error op en herlaad de pagina."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Alle objecten in deze categorie"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr "Het configuratie formaat is gewijzigd. Draai de setup opnieuw aub!"
 
@@ -4754,248 +4541,222 @@ msgstr "Het configuratie formaat is gewijzigd. Draai de setup opnieuw aub!"
 msgid "Please activate debugging for details!"
 msgstr "Activeer aub debugging voor details!"
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Je staat op het punt om de '%s' snapshot te verwijderen."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Verwijder snaphshot"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d,H-i:s"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Fatale error: geen class locaties gedefinieerd - draai aub '%s' om dit op te "
-"lossen"
+msgstr "Fatale error: geen class locaties gedefinieerd - draai aub '%s' om dit op te lossen"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Fatale error: kan class '%s' niet instantiëren - probeer '%s' te draaien om "
-"dit op te lossen"
+msgstr "Fatale error: kan class '%s' niet instantiëren - probeer '%s' te draaien om dit op te lossen"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
+msgstr "FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Gebruikersnaam / UID is niet uniek in de LDAP tree!"
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"Gebruikersnaam / UID is niet uniek in de LDAP tree. Gelieve je "
-"Systeembeheerder te contacteren."
+msgstr "Gebruikersnaam / UID is niet uniek in de LDAP tree. Gelieve je Systeembeheerder te contacteren."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Error tijdens het toevoegen van de lock. Contacteer de programmeurs!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je "
-"systeembeheerder te contacteren!"
+msgstr "Kan de locking informatie voor de LDAP tree niet aanmaken. Gelieve je systeembeheerder te contacteren!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server returned: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Verschillende locks zijn teruggevonden voor het object dat je wilt in lock "
-"plaatsen. Dit zou niet mogen gebeuren - Opschonen van meerdere referenties."
+msgstr "Verschillende locks zijn teruggevonden voor het object dat je wilt in lock plaatsen. Dit zou niet mogen gebeuren - Opschonen van meerdere referenties."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
-"limiet nog steeds overschreden wordt."
+msgstr "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Je staat op het punt de LDAP inzending/inzendingen te wijzigen %s"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
-msgstr ""
+msgstr "Bestand '%s' kon niet verwijderd worden. Probeer fusiondirectory-setup --check-directories om de rechten correct te plaatsen."
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "Kan niet wegschrijven naar revisie bestand!"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr "Kan revisie bestand niet lezen!"
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' is niet beschikbaar. Gebruik default base!"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "LDAP waarschuwing"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"Kan geen schema informatie krijgen van de server. Geen schema verificatie "
-"mogelijk!"
+msgstr "Kan geen schema informatie krijgen van de server. Geen schema verificatie mogelijk!"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Wordt gebruikt om specifieke account informatie op te slaan."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Wordt gebruikt om huidige gewijzigde inzendingen te blokkeren en zo meerdere "
-"wijzingen terzelfde tijd tegen te gaan."
+msgstr "Wordt gebruikt om huidige gewijzigde inzendingen te blokkeren en zo meerdere wijzingen terzelfde tijd tegen te gaan."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Vereiste object class '%s' ontbreekt!"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Optionele object class '%s' ontbreekt!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Versie wanverhouding voor vereist object class '%s' (!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Class(es) beschikbaar"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Je hebt de rfc2307bis optie geactiveerd op de 'ldap setup' stap. maar je "
-"schema configuratie ondersteund deze optie niet."
+msgstr "Je hebt de rfc2307bis optie geactiveerd op de 'ldap setup' stap. maar je schema configuratie ondersteund deze optie niet."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Om rfc2307bis conforme groepen te gebruiken moet de objectClass 'posixGroup' "
-"AUXILIARY zijn."
+msgstr "Om rfc2307bis conforme groepen te gebruiken moet de objectClass 'posixGroup' AUXILIARY zijn."
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Je schema is geconfigureerd om de rfc2307bis groep te ondersteunen, maar je "
-"hebt deze opties niet geactiveerd in de 'ldap setup' stap."
+msgstr "Je schema is geconfigureerd om de rfc2307bis groep te ondersteunen, maar je hebt deze opties niet geactiveerd in de 'ldap setup' stap."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "De objectClass 'posixGroup' moet STRUCTUREEL zijn"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
-"bestaat niet."
+msgstr "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' bestaat niet."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Kan geen vrij ID  toekennen:"
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr "onbekende idAllocation methode!"
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >=%sPoolMax!"
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Kan inzending sambaUnixIdPool niet aanmaken!"
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool is niet uniek!"
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr "Geen ID beschikbaar!"
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "maximum pogingen overschreden!"
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "Kan geen vrij ID toekennen!"
 
@@ -5008,10 +4769,7 @@ msgid ""
 "The last interaction with the FusionDirectory web interface has been some "
 "time ago in the past. For security reasons, the session has been closed. To "
 "continue with administrative tasks, please sign in again."
-msgstr ""
-"De laatste interactie met de FusionDirectory web interface was een tijd "
-"geleden. Voor veiligheidsredenen is de sessie afgesloten. Om verder te gaan "
-"met administratieve taken, gelieve opnieuw in te loggen."
+msgstr "De laatste interactie met de FusionDirectory web interface was een tijd geleden. Voor veiligheidsredenen is de sessie afgesloten. Om verder te gaan met administratieve taken, gelieve opnieuw in te loggen."
 
 #: ihtml/themes/default/logout.tpl.c:8
 msgid "Sign in again"
@@ -5025,9 +4783,7 @@ msgstr "Login scherm"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Gebruik aub je gebruikersnaam en paswoord om in te loggen in het "
-"administratie systeem van de site."
+msgstr "Gebruik aub je gebruikersnaam en paswoord om in te loggen in het administratie systeem van de site."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5038,7 +4794,7 @@ msgstr "Gebruikersnaam"
 
 #: ihtml/themes/default/login.tpl.c:26
 msgid "I forgot my password"
-msgstr ""
+msgstr "Ik ben mijn wachtwoord vergeten"
 
 #: ihtml/themes/default/login.tpl.c:29 ihtml/themes/default/login.tpl.c:32
 #: ihtml/themes/default/login.tpl.c:35 ihtml/themes/default/recovery.tpl.c:32
@@ -5060,7 +4816,6 @@ msgstr "Klik hier om in te loggen"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5070,6 +4825,7 @@ msgstr "Klik hier om in te loggen"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filter"
 
@@ -5081,22 +4837,15 @@ msgstr "Er is een sessie conflict gedetecteerd"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Er is waarschijnlijk een andere instantie van je sessie actief. Meerdere "
-"window operaties zijn technisch niet mogelijk en hangen af van de browser "
-"die je gebruikt. Gebruik van verschillende browsers gelijktijdig (bv. IE en "
-"Mozilla) is mogelijk. Als je op de loguit knop klikt zal deze sessie sluiten."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Er is waarschijnlijk een andere instantie van je sessie actief. Meerdere window operaties zijn technisch niet mogelijk en hangen af van de browser die je gebruikt. Gebruik van verschillende browsers gelijktijdig (bv. IE en Mozilla) is mogelijk. Als je op de loguit knop klikt zal deze sessie sluiten."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Het negeren van dit bericht zal de data die u op dit moment aan het bewerken "
-"bent veranderen/vernietigen, dus sluit a.u.b. enige overige vensters en log "
-"opnieuw in."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Het negeren van dit bericht zal de data die u op dit moment aan het bewerken bent veranderen/vernietigen, dus sluit a.u.b. enige overige vensters en log opnieuw in."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5128,20 +4877,15 @@ msgstr "Klik hier om een reset link te verzenden"
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
-msgstr ""
-"Als geen van de bovenstaande methodes goed is, contacteer dan je "
-"systeembeheerder om je paswoord te veranderen"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
+msgstr "Als geen van de bovenstaande methodes goed is, contacteer dan je systeembeheerder om je paswoord te veranderen"
 
 #: ihtml/themes/default/recovery.tpl.c:29
 msgid ""
 "This dialog provides a simple way to change your password. Enter the new "
 "password (twice) in the fields below and press the 'Change' button."
-msgstr ""
-"Deze dialoog zorgt voor een simpele manier om je paswoord de wijzigen. Vul "
-"het nieuwe paswoord in (tweemaal) in onderstaande velden en klik op de "
-"'Verander' knop."
+msgstr "Deze dialoog zorgt voor een simpele manier om je paswoord de wijzigen. Vul het nieuwe paswoord in (tweemaal) in onderstaande velden en klik op de 'Verander' knop."
 
 #: ihtml/themes/default/recovery.tpl.c:47
 #: ihtml/themes/default/recovery.tpl.c:50
@@ -5153,11 +4897,11 @@ msgstr "Nieuw wachtwoord opnieuw"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
-msgstr "Paswoord moeilijkheid"
+msgstr "Wachtwoord sterkte"
 
 #: ihtml/themes/default/recovery.tpl.c:56
 #: ihtml/themes/default/recovery.tpl.c:89
@@ -5187,21 +4931,18 @@ msgstr "Je paswoord is succesvol gewijzigd."
 msgid ""
 "Enter your current e-mail address in the field below and press the 'Change' "
 "button."
-msgstr ""
-"Vul je huidige e-mail adres in in onderstaand veld en klik op de 'Verander' "
-"knop."
+msgstr "Vul je huidige e-mail adres in in onderstaand veld en klik op de 'Verander' knop."
 
 #: ihtml/themes/default/recovery.tpl.c:74
 msgid ""
 "=> Use your e-mail in the long format, e.g : John Doe => john.doe@ibcp.fr"
-msgstr ""
-"=> Gebruik je e-mail in het lange formaat, bv. John Doe => john.doe@ibcp.fr"
+msgstr "=> Gebruik je e-mail in het lange formaat, bv. John Doe => john.doe@ibcp.fr"
 
 #: ihtml/themes/default/recovery.tpl.c:95
 msgid ""
 "Password recovery is not activated. If you have lost your password, please "
 "contact your administrator"
-msgstr ""
+msgstr "Paswoord herstel is niet geactiveerd. Als u uw wachtwoord verloren hebt, gelieve dan uw beheerder te contacteren"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:2
 msgid "Restoring object snapshots"
@@ -5211,22 +4952,20 @@ msgstr "Restaureer snapshot objecten"
 msgid ""
 "This procedure will restore a snapshot of the selected object. It will "
 "replace the existing object after pressing the folder icon."
-msgstr ""
+msgstr "Deze procedure zal een snapshot herstellen van het geselecteerde object. Het zal het bestaande object overschrijven nadat u op het map icoon hebt gedrukt."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:8
 msgid ""
 "Remember that DNS configuration and database entries could not be restored. "
 "For some objects it is only necessary to open and save them again (goFon), "
 "but some entries must be recreated manually."
-msgstr ""
+msgstr "Onthoud dat de DNS configuratie en databank inzendingen niet hersteld kunnen worden. Voor sommige objecten is het enkel nodig om ze te openen en ze opnieuw op te slaan (goFon), maar sommige inzendingen moeten manueel worden aangemaakt."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:11
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"Vergeet niet de referenties van andere objecten te verifieren, bv bestaat de "
-"geselecteerde printer nog ?"
+msgstr "Vergeet niet de referenties van andere objecten te verifieren, bv bestaat de geselecteerde printer nog ?"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5234,8 +4973,7 @@ msgstr "Er is geen snapshot beschikbaar dat gerestaureerd kan worden"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:20
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
-msgstr ""
-"Kies een snapshot en klik op de dossierfoto om het object te restaureren"
+msgstr "Kies een snapshot en klik op de dossierfoto om het object te restaureren"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:26
 msgid "Creating object snapshots"
@@ -5246,18 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Deze procedure zal een snapshot van het geselecteerde object maken. Het zal "
-"gerestaureerd worden binnen een speciale branch van het directory systeem en "
-"kan later gerestaureerd worden."
+msgstr "Deze procedure zal een snapshot van het geselecteerde object maken. Het zal gerestaureerd worden binnen een speciale branch van het directory systeem en kan later gerestaureerd worden."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Onthoud dat databank inzendingen, DNS configuraties en mogelijk gecrëerde "
-"zones in server extensies niet zullen opgeslagen worden in de snapshot."
+msgstr "Onthoud dat databank inzendingen, DNS configuraties en mogelijk gecrëerde zones in server extensies niet zullen opgeslagen worden in de snapshot."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5272,18 +5005,14 @@ msgstr "Reden voor genereren snapshot"
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "FusionDirectory to get your data back."
-msgstr ""
-"Verifieer aub dubbel of je dit echt wenst te doen want er is geen manier "
-"voor FusionDirectory om je data terug te krijgen."
+msgstr "Verifieer aub dubbel of je dit echt wenst te doen want er is geen manier voor FusionDirectory om je data terug te krijgen."
 
 #: ihtml/themes/default/simple-remove.tpl.c:8
 #: ihtml/themes/default/remove.tpl.c:8 plugins/admin/users/remove.tpl.c:8
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+msgstr "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' om te annuleren."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5294,26 +5023,19 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"als deze blokkeer detectie vals is, de andere persoon heeft waarschijnkijk "
-"de webbrowser gesloten tijden de wijzig operatie. Je kan dit overmeesteren "
-"door op de 'Wijzig toch' knop te klikken."
+msgstr "als deze blokkeer detectie vals is, de andere persoon heeft waarschijnkijk de webbrowser gesloten tijden de wijzig operatie. Je kan dit overmeesteren door op de 'Wijzig toch' knop te klikken."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
-msgstr "Lees enkel"
+msgstr "Read only"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
-"server voor een te grote werkdruk. De eenvoudigste manier om met grote "
-"databases te werken zonder lange timeouts is door zoekopdrachten in grootte "
-"te beperken en door filters te gebruiken voor de informatie die u zoekt."
+msgstr "De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP server voor een te grote werkdruk. De eenvoudigste manier om met grote databases te werken zonder lange timeouts is door zoekopdrachten in grootte te beperken en door filters te gebruiken voor de informatie die u zoekt."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5327,9 +5049,7 @@ msgstr "Negeer deze fout en toon alle gegevens die de LDAP server teruggeeft"
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
-"grootte limiet en laat me daarvoor in de plaats filters gebruiken"
+msgstr "Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde grootte limiet en laat me daarvoor in de plaats filters gebruiken"
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5397,18 +5117,11 @@ msgstr "Aangemeld:"
 msgid "Session expires in %d!"
 msgstr "Sessie vervalt in %d!"
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr "FusionDirectory hoofdmenu"
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Deze kan gebruikt worden door verschillende groepen. Verifêer dubbel of je "
-"dit echt wenst de doen want er is geen manier voor FusionDirectory om je "
-"data terug te halen."
+msgstr "Deze kan gebruikt worden door verschillende groepen. Verifêer dubbel of je dit echt wenst de doen want er is geen manier voor FusionDirectory om je data terug te halen."
 
 #: ihtml/themes/default/logout-close.tpl.c:2
 msgid "Your FusionDirectory session has been closed!"
@@ -5418,9 +5131,7 @@ msgstr "Je FusionDirectroy sessie werd afgesloten!"
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Sluit aub dit browser venster en verwijder de authentificatie caches om "
-"automatische re-authentificatie te vermijden door je browser."
+msgstr "Sluit aub dit browser venster en verwijder de authentificatie caches om automatische re-authentificatie te vermijden door je browser."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5428,20 +5139,17 @@ msgstr "Wijzig je paswoord"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Deze dialoog zorgt voor een simpele manier om je paswoord te wijzigen. Vul "
-"het huidige paswoord en het nieuwe paswoord (tweemaal) in de onderstaande "
-"velden in en druk op de 'Wijzig' knop."
+msgstr "Deze dialoog zorgt voor een simpele manier om je paswoord te wijzigen. Vul het huidige paswoord en het nieuwe paswoord (tweemaal) in de onderstaande velden in en druk op de 'Wijzig' knop."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
@@ -5454,25 +5162,17 @@ msgid ""
 "Some values need to be unique in the complete directory while some "
 "combinations make no sense. FusionDirectory shows the relevant attributes. "
 "Please maintain the values below to fulfill the policies."
-msgstr ""
-"Sommige waarden moeten uniek zijn in de volledige directory terwijl sommige "
-"combinaties geen zin hebben. FusionDirectory toont de relevante attributen. "
-"Behoud aub de waarden hieronder om de policies te vervullen."
+msgstr "Sommige waarden moeten uniek zijn in de volledige directory terwijl sommige combinaties geen zin hebben. FusionDirectory toont de relevante attributen. Behoud aub de waarden hieronder om de policies te vervullen."
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Onthoud dat sommige eigenschappen zoals snaphots zijn en niet kunnen "
-"gekopieerd worden!"
+msgstr "Onthoud dat sommige eigenschappen zoals snaphots zijn en niet kunnen gekopieerd worden!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
 "Or if you copy or cut an entry within FusionDirectory and delete the source "
 "object, you may get errors while pasting this object again!"
-msgstr ""
-"Of als je een kopie of knip doet van een inzending in FusionDirectory en de "
-"bron van het object verwijderd kan je errors krijgen tijdens het plakken van "
-"het object!"
+msgstr "Of als je een kopie of knip doet van een inzending in FusionDirectory en de bron van het object verwijderd kan je errors krijgen tijdens het plakken van het object!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:23
 msgid "Operation complete"
@@ -5494,8 +5194,7 @@ msgstr "Verifiëer paswoord"
 
 #: setup/setup_ldap.tpl.c:2
 msgid "Please choose the LDAP user to be used by FusionDirectory"
-msgstr ""
-"Selecteer aub de LDAP gebruiker die gebruikt zal worden door FusionDirectory"
+msgstr "Selecteer aub de LDAP gebruiker die gebruikt zal worden door FusionDirectory"
 
 #: setup/setup_ldap.tpl.c:5
 msgid "Search"
@@ -5520,7 +5219,7 @@ msgstr "TLS connectie"
 #: setup/setup_ldap.tpl.c:29 setup/setup_ldap.tpl.c:32
 #: setup/setup_migrate.tpl.c:95
 msgid "Reload"
-msgstr "Herstart"
+msgstr "Herlaad"
 
 #: setup/setup_ldap.tpl.c:35
 msgid "Authentication"
@@ -5591,10 +5290,7 @@ msgid ""
 "FusionDirectory supports several encryption types for your passwords. "
 "Normally this is adjustable via user templates, but you can specify a "
 "default method to be used here, too."
-msgstr ""
-"FusionDirectory ondersteund verschillende encryptie types voor je "
-"paswoorden. Normaal is dit wijzigbaar via gebruikerstemplates, maar je hier "
-"ook een standaard methode toevoegen."
+msgstr "FusionDirectory ondersteund verschillende encryptie types voor je paswoorden. Normaal is dit wijzigbaar via gebruikerstemplates, maar je hier ook een standaard methode toevoegen."
 
 #: setup/setup_config1.tpl.c:68
 msgid ""
@@ -5602,44 +5298,28 @@ msgid ""
 "This is a workaround till OpenLDAP's in directory ACI's are    fully "
 "implemented. For this to work, we need the admin DN and the corresponding "
 "password."
-msgstr ""
-"FusionDirectory gedraagd zich altijd als admin en beheerd toegangsrechten "
-"intern. Dit is een workaround tot OpenLDAP's in directory ACI's volledig "
-"gëimplementeerd zijn. Om dit te doen werken hebben we de admin DN en zijn "
-"wachtwoord nodig."
+msgstr "FusionDirectory gedraagd zich altijd als admin en beheerd toegangsrechten intern. Dit is een workaround tot OpenLDAP's in directory ACI's volledig gëimplementeerd zijn. Om dit te doen werken hebben we de admin DN en zijn wachtwoord nodig."
 
 #: setup/setup_config1.tpl.c:71
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where "
 "FusionDirectory saves people and groups, including the way accounts get "
 "created. Check the values below if the fit your needs."
-msgstr ""
-"Sommige basis LDAP parameters zijn wijzigbaar en hebben effect op de "
-"locaties waar FusionDirectory people en groups bewaard, inclusief de manier "
-"waarop accounts worden aangemaakt. Verifieer de waarden hieronder of ze "
-"voldoen aan je benodigdheden."
+msgstr "Sommige basis LDAP parameters zijn wijzigbaar en hebben effect op de locaties waar FusionDirectory people en groups bewaard, inclusief de manier waarop accounts worden aangemaakt. Verifieer de waarden hieronder of ze voldoen aan je benodigdheden."
 
 #: setup/setup_config1.tpl.c:74
 msgid ""
 "FusionDirectory has modular support for several mail methods. These methods "
 "provide interfaces to users mailboxes and general handling    for quotas. "
 "You can choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"FusionDirectory heeft modulaire ondersteuning voor verschillende mail "
-"methoden. Deze methoden bezorgen interfaces naar gebruikers mailboxen en "
-"generale handling voor quotas. Je kan deze plugin kiezen voor al je mail "
-"opties onveranderd te laten."
+msgstr "FusionDirectory heeft modulaire ondersteuning voor verschillende mail methoden. Deze methoden bezorgen interfaces naar gebruikers mailboxen en generale handling voor quotas. Je kan deze plugin kiezen voor al je mail opties onveranderd te laten."
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
-msgstr ""
-"Tijdens de LDAP inspectie, gaan we verschillende pitfalls verifiëren dit kan "
-"gebeuren wanneer er een migratie gebeurd van FusionDirectory base LDAP "
-"administratie. Je zou de onderstaande problemen moeten oplossen, om de "
-"services vlot te laten verlopen."
+msgstr "Tijdens de LDAP inspectie, gaan we verschillende pitfalls verifiëren dit kan gebeuren wanneer er een migratie gebeurd van FusionDirectory base LDAP administratie. Je zou de onderstaande problemen moeten oplossen, om de services vlot te laten verlopen."
 
 #: setup/setup_migrate.tpl.c:5
 msgid "Check again"
@@ -5675,19 +5355,14 @@ msgstr "Verplaats groepen naar geconfigureerde group tree"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Deze dialoog staat toe om verschillende groepen naar de geconfigureerde "
-"group tree te verhuizen. Door dit te doen kan je je LDAP service schoonmaken."
+msgstr "Deze dialoog staat toe om verschillende groepen naar de geconfigureerde group tree te verhuizen. Door dit te doen kan je je LDAP service schoonmaken."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "groups. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Wees voorzichtig met deze optie! Er kunnen referenties verwijzen naar deze "
-"groepen. De FusionDirectory setup kan geen referenties migreren, dus je kan "
-"beter de migratie annuleren in dit geval."
+msgstr "Wees voorzichtig met deze optie! Er kunnen referenties verwijzen naar deze groepen. De FusionDirectory setup kan geen referenties migreren, dus je kan beter de migratie annuleren in dit geval."
 
 #: setup/setup_migrate.tpl.c:32
 msgid "Move selected groups into this group tree"
@@ -5715,20 +5390,14 @@ msgstr "Verplaats gebruikers in deze geconfigureerde user tree"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Deze dialoog staat je toe om verschillende gebruikers te verplaatsen naar de "
-"geconfigureerde user tree. Als je dit doet kan je je LDAP service "
-"schoonmaken."
+msgstr "Deze dialoog staat je toe om verschillende gebruikers te verplaatsen naar de geconfigureerde user tree. Als je dit doet kan je je LDAP service schoonmaken."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
 "Be careful with this option! There may be references pointing to these "
 "users. The FusionDirectory setup can't migrate references, so you may want "
 "to cancel the migration in this case."
-msgstr ""
-"Wees voorzichtig met deze optie! Er kunnen referenties verwijzen naar deze "
-"gebruikers. De FusionDirectory setup kan geen referenties migreren, je kan "
-"de migratie annuleren in dit geval."
+msgstr "Wees voorzichtig met deze optie! Er kunnen referenties verwijzen naar deze gebruikers. De FusionDirectory setup kan geen referenties migreren, je kan de migratie annuleren in dit geval."
 
 #: setup/setup_migrate.tpl.c:59
 msgid "Move selected users into this people tree"
@@ -5742,13 +5411,11 @@ msgstr "Migreer GOsa 2.5 administratieve accounts"
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into "
 "FusionDirectory 1.0 useable accounts."
-msgstr ""
-"Deze dialoog staat je toe om GOsa 2.5 admin accounts te migreren in "
-"FusionDirectory 1.0 bruikbare accounts."
+msgstr "Deze dialoog staat je toe om GOsa 2.5 admin accounts te migreren in FusionDirectory 1.0 bruikbare accounts."
 
 #: setup/setup_migrate.tpl.c:107
 msgid "Abort"
-msgstr "Abort"
+msgstr "Onderbreek"
 
 #: setup/setup_migrate.tpl.c:110
 msgid "Create a new FusionDirectory administrator account"
@@ -5758,9 +5425,7 @@ msgstr "Maak een nieuwe FusionDirectory administrator account"
 msgid ""
 "This dialog will automatically add a new super administrator to your LDAP "
 "tree."
-msgstr ""
-"Deze dialoog zal automatisch een nieuwe super administrator toevoegen in je "
-"LDAP tree."
+msgstr "Deze dialoog zal automatisch een nieuwe super administrator toevoegen in je LDAP tree."
 
 #: setup/setup_migrate.tpl.c:119
 msgid "User ID"
@@ -5775,10 +5440,7 @@ msgid ""
 "The listed departments are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of entries, select them "
 "and use the migrate button below."
-msgstr ""
-"De getoonde departementen zijn momenteel onzichtbaar in de FusionDirectory "
-"gebruikersinterface. Als je deze wilt verander voor een aantal inzendingen, "
-"selecteer ze and gebruik de onderstaande migreer knop."
+msgstr "De getoonde departementen zijn momenteel onzichtbaar in de FusionDirectory gebruikersinterface. Als je deze wilt verander voor een aantal inzendingen, selecteer ze and gebruik de onderstaande migreer knop."
 
 #: setup/setup_migrate.tpl.c:137 setup/setup_migrate.tpl.c:164
 #: setup/setup_migrate.tpl.c:191 setup/setup_migrate.tpl.c:221
@@ -5786,35 +5448,26 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Als je wilt weten wat er zal gebeuren wanneer je de geselecteerde "
-"inzendingen migreerd, gebruik de 'Toon veranderingen' knop om de LDIF te "
-"bekijken."
+msgstr "Als je wilt weten wat er zal gebeuren wanneer je de geselecteerde inzendingen migreerd, gebruik de 'Toon veranderingen' knop om de LDIF te bekijken."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
 "The listed users are currently invisible in the FusionDirectory user "
 "interface. If you want to change this for a couple of users, just select "
 "them and use the 'Migrate' button below."
-msgstr ""
-"De lijst van gebruikers die momenteel zichtbaar is zijn onzichtbaar in de "
-"FusionDirectory gebruikersinterface. Als je dit wenst te wijzigen voor "
-"enkele gebruiksers, selecteer ze dan en gebruik de 'Migreer' knop hieronder."
+msgstr "De lijst van gebruikers die momenteel zichtbaar is zijn onzichtbaar in de FusionDirectory gebruikersinterface. Als je dit wenst te wijzigen voor enkele gebruiksers, selecteer ze dan en gebruik de 'Migreer' knop hieronder."
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"De lijst van apparaten zijn momenteel onzichtbaar in de FusionDirectory "
-"interface. Als je dit wenst te wijzigen voor een aantal apparaten, selecteer "
-"ze en gebruik de 'migreer' knop hieronder."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
+msgstr "De lijst van apparaten zijn momenteel onzichtbaar in de FusionDirectory interface. Als je dit wenst te wijzigen voor een aantal apparaten, selecteer ze en gebruik de 'migreer' knop hieronder."
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "Ververs"
 
@@ -5823,20 +5476,14 @@ msgid ""
 "The listed services are currently invalid for the FusionDirectory version "
 "you are going to install. If you want to update a couple of service, just "
 "select them and use the 'Migrate' button below."
-msgstr ""
-"De lijst van diensten zijn momenteel niet geldig voor de FusionDirectory "
-"versie die je gaat installeren. Als je een aantal diensten wenst up te "
-"daten, selecteer ze en gebruik de 'Migreer' knop hieronder."
+msgstr "De lijst van diensten zijn momenteel niet geldig voor de FusionDirectory versie die je gaat installeren. Als je een aantal diensten wenst up te daten, selecteer ze en gebruik de 'Migreer' knop hieronder."
 
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
-msgstr ""
-"De lijst van menu's zijn momenteel onzichtbaar in de FusionDirectory "
-"interface. Als je dit wenst te wijzigen voor een aantal diensten, selecteer "
-"ze dan en gebruik de 'Migreer' knop hieronder."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
+msgstr "De lijst van menu's zijn momenteel onzichtbaar in de FusionDirectory interface. Als je dit wenst te wijzigen voor een aantal diensten, selecteer ze dan en gebruik de 'Migreer' knop hieronder."
 
 #: setup/setup_feedback.tpl.c:2
 msgid "Feedback successfully send"
@@ -5856,12 +5503,9 @@ msgstr "Stuur feedback naar het FusionDirectory project team"
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
-msgstr ""
-"Wanneer deze optie aangevinkt is zal FusionDirectory proberen een connectie "
-"te maken  met http://www.fusiondirectory.org om je formulier anoniem op te "
-"sturen."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
+msgstr "Wanneer deze optie aangevinkt is zal FusionDirectory proberen een connectie te maken  met http://www.fusiondirectory.org om je formulier anoniem op te sturen."
 
 #: setup/setup_feedback.tpl.c:26
 msgid "Did the setup procedure help you to get started?"
@@ -5920,9 +5564,9 @@ msgid "What features of FusionDirectory do you use?"
 msgstr "Welke features van FusionDirectory gebruik je?"
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
-msgstr ""
-"Welke features wil je zien in de toekomstige versies van FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
+msgstr "Welke features wil je zien in de toekomstige versies van FusionDirectory?"
 
 #: setup/setup_feedback.tpl.c:83
 msgid "Send feedback"
@@ -5935,12 +5579,9 @@ msgstr "Selecteer aub de gewenste taal"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"Op dit punt,kan je de standaard taal kiezen voor de site, 'automatic' komt "
-"overeen met de taal van de browser. Deze optie kan worden overroepen door de "
-"gebruiker."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "Op dit punt,kan je de standaard taal kiezen voor de site, 'automatic' komt overeen met de taal van de browser. Deze optie kan worden overroepen door de gebruiker."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -5954,27 +5595,27 @@ msgstr "Kies hier aub je gewenste tijdzone"
 msgid "FusionDirectory core settings"
 msgstr "FusionDirectory core opties"
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Activeer functie blokkeer wijziging"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr "FusionDirectory logs"
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Forceer register_globals om gedesactiveerd te worden"
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Toon PHP fouten"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Niet actief"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Actief"
 
@@ -5995,10 +5636,7 @@ msgid ""
 "This seems to be the first time you start FusionDirectory - we didn't find "
 "any configuration right now. This simple wizard intends to help you while "
 "setting it up."
-msgstr ""
-"Dit blijkt de eerste keer te zijn dat je FusionDirectory start - we vonden "
-"op dit moment geen configuratie. Deze simpele wizard is hier om je te helpen "
-"FusionDirectory op te zetten."
+msgstr "Dit blijkt de eerste keer te zijn dat je FusionDirectory start - we vonden op dit moment geen configuratie. Deze simpele wizard is hier om je te helpen FusionDirectory op te zetten."
 
 #: setup/setup_welcome.tpl.c:5
 msgid "What will the wizard do for you?"
@@ -6042,15 +5680,11 @@ msgid ""
 "creating the file '/tmp/fusiondirectory.auth', containing the current "
 "session ID on the servers local filesystem. This can be done by executing "
 "the following command:"
-msgstr ""
-"Voor veiligheidsredenen moet je je authentificeren voor de installatie door "
-"het maken van het bestand '/tmp/fusiondirectory.auth', bestaande uit de "
-"huidige sessie ID en het lokale bestandsysteem van de server. Dit kan worden "
-"gedaan door het volgende commando uit te voeren:"
+msgstr "Voor veiligheidsredenen moet je je authentificeren voor de installatie door het maken van het bestand '/tmp/fusiondirectory.auth', bestaande uit de huidige sessie ID en het lokale bestandsysteem van de server. Dit kan worden gedaan door het volgende commando uit te voeren:"
 
 #: setup/setup_welcome.tpl.c:35
 msgid "Click the 'Next' button when you've finished."
-msgstr ""
+msgstr "Klik op de 'Next' knop wanneer je klaar bent."
 
 #: setup/setup_checks.tpl.c:2
 msgid "PHP module and extension checks"
@@ -6094,17 +5728,15 @@ msgstr "Schema verificatie faalde."
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"Kon geen schema informatie lezen, alle verificaties zijn overgeslagen. Pas "
-"je ldap acls aan."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "Kon geen schema informatie lezen, alle verificaties zijn overgeslagen. Pas je ldap acls aan."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
 "It seems that your ldap database wasn't initialized yet. This might be the "
 "reason why FusionDirectory can't read your schema configuration!"
-msgstr ""
+msgstr "Blijkbaar is je ldap databank nog niet geinitialiseerd. Dit zou de reden kunnen zijn waarom FusionDirectory je schema configuratie niet kan lezen!"
 
 #: setup/setup_finish.tpl.c:2
 msgid "Create your configuration file"
@@ -6147,9 +5779,7 @@ msgstr "Dit object heeft geen relatie met andere objecten."
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle "
-"programma's die dit wachtwoord gebruiken ook aanpast!"
+msgstr "U heeft succesvol uw wachtwoord veranderd. Denkt u eraan dat u alle programma's die dit wachtwoord gebruiken ook aanpast!"
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6162,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Gebruik het veld hieronder om uw persoonlijke wachtwoord te veranderen. De "
-"veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u."
-"b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
+msgstr "Gebruik het veld hieronder om uw persoonlijke wachtwoord te veranderen. De veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u.b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6173,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Het veranderen van het wachtwoord is van invloed op E-mail, proxy, samba en "
-"Unix diensten."
+msgstr "Het veranderen van het wachtwoord is van invloed op E-mail, proxy, samba en Unix diensten."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr "Je paswoord is vervallen. Gelieve een nieuw paswoord te kiezen!"
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Herhaal het nieuwe wachtwoord"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr "Paswoord wijzig dialoog"
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr "Gebruiksvoorwaarden"
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr "Specifieer paswoord manueel"
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Wachtwoord instellen"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Wis velden"
 
@@ -6221,55 +5841,10 @@ msgstr "Wis velden"
 msgid "Your password hash method will not be changed!"
 msgstr "Je paswoord hash methode zal niet worden aangepast!"
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificaten"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Standaard certificaat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "S/MIME certificaat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "PKCS12 certificaat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Certificaat serienummer"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Persoonlijk plaatje"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Plaatje verwijderen"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Gebruikersinstellingen"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Achternaam"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Voornaam"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Wachtwoord wissen"
@@ -6278,59 +5853,17 @@ msgstr "Wachtwoord wissen"
 msgid "Set new password"
 msgstr "Nieuw wachtwoord instellen"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Persoonlijke informatie"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Verander plaatje"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Sjabloon naam"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Voorkeurstaal"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Telefoon privé"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Wachtwoord encryptie"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Restricteer login op"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP of netwerk"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Organisatie informatie"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Afdeling nr."
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Personeel nr."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Kamer nr."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Gebruik a.u.b. de telefoon tab"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Plaatje verwijderen"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6347,23 +5880,6 @@ msgstr "Toon Samba groepen"
 msgid "Show mail groups"
 msgstr "Toon mailgroepen"
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Toon servers"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Toon werkstations"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr "Toon Windows PC"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Toon terminals"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6382,15 +5898,6 @@ msgstr "Plaatsnaam die je went aan te maken"
 msgid "Descriptive text for department"
 msgstr "Omschrijving voor de afdeling"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Bezig met verwerken van de gevraagde opdracht"
@@ -6399,9 +5906,7 @@ msgstr "Bezig met verwerken van de gevraagde opdracht"
 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."
+msgstr "Uw browser heeft geen ondersteuning voor frames. Gebruik a.u.b. deze link om de gewenste opdracht uit te voeren."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6415,10 +5920,7 @@ msgstr "Je bent momenteel dit departement aan het verplaatsen/hernoemen"
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"Het wijzigen vaan departement zijn naam attribuut 'ou' of base kan "
-"resulteren in corrupte acls en snapshots inzendingen voor alle volledige "
-"objecten."
+msgstr "Het wijzigen vaan departement zijn naam attribuut 'ou' of base kan resulteren in corrupte acls en snapshots inzendingen voor alle volledige objecten."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6428,9 +5930,7 @@ msgstr "FusionDirectory kan dit nog NIET oplossen voor jou."
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Voor je deze actie confirmeerd, wees er zeker van dat alles is zoals je "
-"verwacht, neem een backup voor je dit toepast."
+msgstr "Voor je deze actie confirmeerd, wees er zeker van dat alles is zoals je verwacht, neem een backup voor je dit toepast."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6475,20 +5975,14 @@ msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. 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 'alle' accounts,systemen,etc. in deze subtree. Verifieer aub "
-"dubbel of je dit echt wenst te doen want er is geen manier voor "
-"FusionDirectory om je data terug te plaatsen."
+msgstr "Dit bevat 'alle' accounts,systemen,etc. in deze subtree. Verifieer aub dubbel of je dit echt wenst te doen want er is geen manier voor FusionDirectory om je data terug te plaatsen."
 
 #: plugins/admin/departments/remove.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."
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6518,9 +6012,7 @@ msgstr "Template aan het toepassen"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Template aan het toepassen voor verschillende gebruikers, alle "
-"gebruikersattributen gedefinieerd in de template zullen worden toegekend."
+msgstr "Template aan het toepassen voor verschillende gebruikers, alle gebruikersattributen gedefinieerd in de template zullen worden toegekend."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6535,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Het aanmaken van een nieuwe gebruiker kan m.b.v. sjablonen gebeuren. Veel "
-"database records zullen dan automatisch gevuld worden. Kies 'geen' om het "
-"gebruik van sjablonen over te slaan."
+msgstr "Het aanmaken van een nieuwe gebruiker kan m.b.v. sjablonen gebeuren. Veel database records zullen dan automatisch gevuld worden. Kies 'geen' om het gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6562,33 +6051,23 @@ msgstr "Toon Samba gebruikers"
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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."
 
 #: plugins/admin/users/password.tpl.c:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Gebruik de velden hieronder om het gebruikers wachtwoord te veranderen. De "
-"veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord "
-"a.u.b. aangezien de gebruiker niet in kan loggen zonder dit wachtwoord."
+msgstr "Gebruik de velden hieronder om het gebruikers wachtwoord te veranderen. De veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord a.u.b. aangezien de gebruiker niet in kan loggen zonder dit wachtwoord."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Sterkte"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr "Paswoord input dialoog"
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr "Forceer paswoord wijzigen voor de volgende login."
 
@@ -6621,9 +6100,7 @@ msgstr "POSIX naam van de groep"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Normaliter worden IDs automatisch gegenereerd. Selecteer om handmatig te "
-"specificeren"
+msgstr "Normaliter worden IDs automatisch gegenereerd. Selecteer om handmatig te specificeren"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6639,10 +6116,7 @@ msgstr "Geforceerd ID nummer"
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for FusionDirectory to get your data back."
-msgstr ""
-"Dit kan een primaire gebruikersgroep zijn. Verifieer aub dubbel of je dit "
-"echt wenst te doen want er is geen manier voor FusionDirectory om je data "
-"terug te krijgen."
+msgstr "Dit kan een primaire gebruikersgroep zijn. Verifieer aub dubbel of je dit echt wenst te doen want er is geen manier voor FusionDirectory om je data terug te krijgen."
 
 #: plugins/admin/groups/trust_machines.tpl.c:2
 #: plugins/admin/ogroups/trust_machines.tpl.c:2
@@ -6741,6 +6215,11 @@ msgstr "Toon server"
 msgid "Show workstation"
 msgstr "Toon werkstation"
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr "Toon Windows PC"
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr "Toon terminal"
@@ -6805,11 +6284,14 @@ msgstr "Naam van de groep"
 msgid "Member objects"
 msgstr "Lidmaatschap objecten"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Meerdere wijzigingen"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Toon servers"
 
-#~ msgid "In all groups"
-#~ msgstr "In alle groepen"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Toon werkstations"
 
-#~ msgid "Not in all groups"
-#~ msgstr "Niet in alle groepen"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Toon terminals"
diff --git a/locale/pl/fusiondirectory.po b/locale/pl.po
similarity index 69%
rename from locale/pl/fusiondirectory.po
rename to locale/pl.po
index 678dba423588962b1689925d3d162eb1896e1345..7fbce510fe565e4c4a928cae9c526d241669fa1b 100644
--- a/locale/pl/fusiondirectory.po
+++ b/locale/pl.po
@@ -1,55 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/pl/)\n"
-"Language: pl\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/FusionDirectory/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "Nie"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Tak"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Błąd ustawień"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -70,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Tek krok umożliwia wybranie preferowanego języka."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -181,57 +178,56 @@ msgstr ""
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "PrzenieÅ›"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Niepowodzenie"
 
@@ -241,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Błąd migracji"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -290,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Utwórz"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Grupy"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Błąd wejścia"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr "Uid"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Błąd hasła"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Błąd"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "do"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -522,13 +505,10 @@ msgstr "Dodaj"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Usuń"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -704,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -723,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -818,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Następne"
 
@@ -869,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -877,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Błąd krytyczny"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Podane hasła 'Nowe hasło' oraz 'Powtórz nowe hasło' nie są itentyczne."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -926,67 +905,67 @@ msgstr "Podane hasła 'Nowe hasło' oraz 'Powtórz nowe hasło' nie są itentycz
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "Sesja nie będzie szyfrowana."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Sprowadź sesję SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -999,134 +978,131 @@ msgstr "Smarty"
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Konfiguracja PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Zmiana hasła"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Dodatek"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr "Błąd konfiguracji"
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "Sesja nie jest szyfrowana!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Błąd Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "Istnieje problem z ustawieniami autentykacji!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Proszę podać prawidłową nazwę użytkownika!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Proszę podać prawidłowe hasło!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Błąd autentykacji"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Proszę sprawdzić kombinację login/hasło."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Twoja przeglądarka ma wyłączone cookies. Proszę włączyć cookies i "
-"przeładować stronę przed logowaniem!"
+msgstr "Twoja przeglądarka ma wyłączone cookies. Proszę włączyć cookies i przeładować stronę przed logowaniem!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Informacja"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1137,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Siła"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1166,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Przełącz informacje"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Login"
@@ -1194,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1206,9 +1178,8 @@ msgid "Password"
 msgstr "Hasło"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Błąd hasła"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -1220,21 +1191,28 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Port"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Dodatek"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Informacje osobiste"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1242,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Witaj %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Ogólne"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Poczta"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1292,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Grupa"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Departament"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Telefon"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Aplikacja"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Serwer"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Cienki klient"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Stacja robocza"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Grupa obiektu"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1385,469 +1360,461 @@ msgstr "Konfiguracja"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Dodatki"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Język"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Minimalna długość hasła"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Różne"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "Zaczepy"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1876,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "Hasło które podano jako obecne nie zgadza się z prawdziwym hasłem."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Ogólne informacje o użytkowniku"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "kobieta"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "mężczyzna"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Nie można wgrać pliku!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "ImiÄ™"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "ImiÄ™"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Strona domowa"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Komórka"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Pager"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Data urodzenia"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Jednostka"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Identyfikator budynku"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Wywołanie"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Ostatnia dostawa"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Lokalizacja osoby"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Opis jednostki"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Sektor"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Tytuł funkcjonalny"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Publicznie widoczne"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Ulica"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Pełniona funkcja"
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Kod pocztowy"
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2142,122 +1897,76 @@ msgstr "Ogólne ustawienia użytkownika"
 msgid "User"
 msgstr "Użytkownik"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Informacje osobiste"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "Nazwisko"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Identyfikacja użytkownika"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "ImiÄ™"
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Data urodzenia"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Płeć"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Preferowany język"
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Kontener"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Zdjęcie użytkownika"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organizacja"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Numer departamentu"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2269,66 +1978,52 @@ msgstr "Numer departamentu"
 msgid "Description"
 msgstr "Opis"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Numer pracownika"
-
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Typ pracownika"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Numer pokoju"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Numer telefonu"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Numer pagera"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Telefon komórkowy"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Numer fax"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Stan"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2336,306 +2031,439 @@ msgstr "Stan"
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Adres pocztowy"
-
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "Adres domowy"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Stan"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
-msgstr "Numer telefonu domowego"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Adres"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Numer pokoju"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Numer pokoju"
+
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Komórka"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Stacja Windows"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Pager"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Terminal"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Edytuj właściwości Poczty"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Informacje organizacyjne"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Edytuj właściwości Samba"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organizacja"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Edytuj właściwości Telefonu"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Numer departamentu"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Numer departamentu"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Numer pracownika"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Numer pracownika"
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Typ pracownika"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Åšrodowisko"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Edytuj właściwości Środowiska"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "Adres domowy"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Telefon prywatny"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr "Numer telefonu domowego"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Strona domowa"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "ImiÄ™"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Grupa podstawowa"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Status"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "WymuÅ› UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Przynależność do grup"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "Użytkownik musi zmienić hasło przy pierwszym logowaniu"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Zaufanie systemowe"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Tryb zaufania"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "wyłączone"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "pełen dostęp"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "nieskonfigurowane"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automatyczne"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "wygasło"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "Czas prolongaty aktywny"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "Aktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "hasło wygasło"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr "hasło niezmienialne"
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Grupa użytkownika"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2754,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2767,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr "Nazwa organizacji"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Kategoria"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "Numer telefonu"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Kontener"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Ustawienia administracyjne"
+msgid "Postal address"
+msgstr "Adres pocztowy"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "Numer telefonu"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Zaznaczanie '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Kontynuuj"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Nieznane"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Przenoszenie '%s' do '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Obiekt"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "BŁĄD kopiowania %s, anulowanie operacji"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Kontynuuj"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Departamenty"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Nazwa departamentu"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Adres"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Telefon"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Obiekt '%s' jest już zaznaczony"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Usuwanie znacznika z obiektu '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Domena"
 
@@ -2897,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Kraj"
 
@@ -2906,8 +2719,8 @@ msgstr "Kraj"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2915,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Akcje"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Edytuj"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr "Nazwa Kraju"
@@ -2950,11 +2765,24 @@ msgid "List of users"
 msgstr "Lista użytkowników"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Szablon"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Nazwisko"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "ImiÄ™"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2966,7 +2794,7 @@ msgstr "Szablon"
 msgid "Properties"
 msgstr "Właściwości"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Zmień hasło"
@@ -2987,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "Edytuj użytkownika"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -3003,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr "Zarządzaj użytkownikami"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr "Uprawnienie"
 
@@ -3020,39 +2848,39 @@ msgstr "Uprawnienie"
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "żaden"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr "Blokowanie konta"
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr "Odblokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr "Zablokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3060,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Grupa Samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Administratorzy domeny"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Użytkownicy domeny"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Goście domeny"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Specjalna grupa (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3119,23 +2947,23 @@ msgstr ""
 msgid "Generic group settings"
 msgstr "Ogólne ustawienia grupy"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Typ grupy Samba"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Grupie odbioru telefonu"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Grupa nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Członek grupy"
 
@@ -3163,117 +2991,159 @@ msgstr ""
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Edytuj właściwości Poczty"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Edytuj właściwości Samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Edytuj właściwości Telefonu"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Åšrodowisko"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Edytuj właściwości Środowiska"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Wybierz użytkownika"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Wszystkie kategorie"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Resetuj ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Jeden poziom"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Obecny obiekt"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Pełne poddrzewo"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Pełne poddrzewo (trwałe)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Góra"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "W dół"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Usuń"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "Brak ustawień ACL w tej kategorii"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Wszystkie obiekty w obecnym poddrzewie"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Pełniona funkcja"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "Uprawnienia"
 
@@ -3281,10 +3151,10 @@ msgstr "Uprawnienia"
 msgid "List of acls"
 msgstr "Lista ACLi"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
-msgstr ""
+msgstr "ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:37
 msgid "Access control list management"
@@ -3299,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "Szablony ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Grupy obiektów"
 
@@ -3319,51 +3189,62 @@ msgstr "Szablony"
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Kolejka telefoniczna"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Aplikacje"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Stacja Windows"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "UrzÄ…dzenia"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Startup"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Systemy"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Podsumowanie FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Kolejka telefoniczna"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Aplikacje"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3393,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr "Podstawowa grupa obiektu"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Członek"
 
@@ -3424,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Proces usuwania został anulowany przez dodatek '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Zależności"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Edytuj ten obiekt"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Usuń ten obiekt"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr "w"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3497,29 +3374,29 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumenty"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr "Tworzenie tej strony spowodowało, że interpreter PHP zwrócił błędy!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Przełącz informacje"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
@@ -3529,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Pokaż serwery"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3542,103 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Grupa użytkownika"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Nie można wgrać pliku!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Certyfikat jest pusty!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Przeładuj"
+msgstr "Wgraj"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "W dół"
+msgstr "ÅšciÄ…gnij"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nazwa obiektu"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3660,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr "Zaznacz aby wyszukiwać wewnątrz poddrzew"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3798,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Przykład"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3915,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3927,300 +3835,300 @@ msgstr "Anuluj"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Zapisz"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Usuń %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Ustaw"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Ustaw %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Edytuj..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Edytuj %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Wróć"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Styczeń"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Luty"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Marzec"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Maj"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Lipiec"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Sierpień"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Wrzesień"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Październik"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Listopad"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Grudzień"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "PiÄ…tek"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Sobota"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Błąd komunikacji z usługą infrastruktury!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Błąd komunikacji z usługą infrastruktury: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "Plik '%s' nie istnieje!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4241,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr "PDF"
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Certyfikat jest pusty!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Nie załadowano prawidłowego certyfikatu!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Anuluj wszystko"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Błąd XML w pliku fusiondirectory.conf: %s w linii %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Wszystkie kategorie"
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Moje konto "
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Wyślij"
 
@@ -4349,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "od"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Resetuj ACL'e"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Użyj ACL zdefiniowanego w tej roli"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Zawiera ACL'e w tych kategoriach: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "Kategoria ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Utwórz obiekty"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "PrzenieÅ› obiekty"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Usuń obiekty"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "czytanie"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "zapisywanie"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Członkowie"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Wybierz wszystko"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr "utworzone przez"
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Przejdź do departamentu użytkowników"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Wytnij"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
@@ -4566,64 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Ostrzeżenie wydajności"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
-"'dn: ...' w linii %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się 'dn: ...' w linii %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Wszystkie obiekty w tej kategorii"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4631,225 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Zamierzasz usunąć snapshot '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Usuń snapshot"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "BŁĄD: Nie można połączyć się z serwerem LDAP. Odpowiedź serwera '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
-"przekroczony"
+msgstr "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest przekroczony"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "Wpisów na stronie"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Brak opcjonalnego obiektu klasy '%s'!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4909,7 +4816,6 @@ msgstr "Kliknij tutaj aby się zalogować"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4919,6 +4825,7 @@ msgstr "Kliknij tutaj aby się zalogować"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Filtr"
 
@@ -4930,21 +4837,15 @@ msgstr "Wykryto konflikt sesji"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Prawdopodobnie istnieje inna aktywna instacja sesji. Operowanie na kilku "
-"oknach nie jest technicznie możliwe i mocno zależy od używanej przeglądarki. "
-"Użycie różnych przeglądarek (np. IE i Mozilla) jest możliwe. Naciśnięcie "
-"przycisku Wyloguj zamknie tÄ… sesjÄ™."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Prawdopodobnie istnieje inna aktywna instacja sesji. Operowanie na kilku oknach nie jest technicznie możliwe i mocno zależy od używanej przeglądarki. Użycie różnych przeglądarek (np. IE i Mozilla) jest możliwe. Naciśnięcie przycisku Wyloguj zamknie tą sesję."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Ignorując ten komunikat zmienisz/usuniesz dane które obecnie edytujesz. "
-"Proszę zamknąć wiele okien i zalogować się ponownie."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Ignorując ten komunikat zmienisz/usuniesz dane które obecnie edytujesz. Proszę zamknąć wiele okien i zalogować się ponownie."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -4976,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4996,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5083,9 +4984,7 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Ta procedura utworzy snapshot wybranego obiektu. Kopia obiektu zostanie "
-"zachowana w specjalnej gałęzi i będzie mogła zostać przywrócona później."
+msgstr "Ta procedura utworzy snapshot wybranego obiektu. Kopia obiektu zostanie zachowana w specjalnej gałęzi i będzie mogła zostać przywrócona później."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
@@ -5113,9 +5012,7 @@ msgstr ""
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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ć."
+msgstr "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby anulować."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5126,10 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Jeśli to wykrycie blokady jest błędne, inna osoba prawdopodobnie zamknęła "
-"okno przeglądarki podczas operacji edycji. Można przejąć blokadę naciskając "
-"Edytuj."
+msgstr "Jeśli to wykrycie blokady jest błędne, inna osoba prawdopodobnie zamknęła okno przeglądarki podczas operacji edycji. Można przejąć blokadę naciskając Edytuj."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5137,15 +5031,11 @@ msgstr "Tylko do odczytu"
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"Limit rozmiaru powoduje szybsze operacje LDAP i zapobiega nadmiernemu "
-"obciążeniu serwera LDAP. Najprostrzym sposobem działania na dużych bazach "
-"bez opóźnień jest ograniczanie wyszukiwań do mniejszej ilości wyników oraz "
-"użycie filtrów dla otrzymania poszukiwanych elementów."
+msgstr "Limit rozmiaru powoduje szybsze operacje LDAP i zapobiega nadmiernemu obciążeniu serwera LDAP. Najprostrzym sposobem działania na dużych bazach bez opóźnień jest ograniczanie wyszukiwań do mniejszej ilości wyników oraz użycie filtrów dla otrzymania poszukiwanych elementów."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5159,9 +5049,7 @@ msgstr "Ignoruj ten błąd i pokaż wszystkie elementy które zwraca serwer LDAP
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"ignoruj ten błąd i pokaż wszystkie elementy które zmieszczą się w "
-"zdefiniowanych limicie rozmiaru i pozwól mi użyć filtrów"
+msgstr "ignoruj ten błąd i pokaż wszystkie elementy które zmieszczą się w zdefiniowanych limicie rozmiaru i pozwól mi użyć filtrów"
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5229,10 +5117,6 @@ msgstr "Zalogowano:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5255,17 +5139,17 @@ msgstr "Zmień swoje hasło"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Obecne hasło"
 
@@ -5282,8 +5166,7 @@ msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Pamiętaj, że niektóre właściwości jak snapshoty nie zostaną skopiowane!"
+msgstr "Pamiętaj, że niektóre właściwości jak snapshoty nie zostaną skopiowane!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
@@ -5433,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5576,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "Odśwież"
 
@@ -5598,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5620,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5681,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5695,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5711,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Włączone"
 
@@ -5844,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5895,9 +5779,7 @@ msgstr "Ten obiekt nie posiada powiązań z innymi obiektami."
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Pomyślnie zmieniono hasło. Proszę pamiętać aby zmienić również ustawienia w "
-"programach skonfigurowanych do używania tego hasła."
+msgstr "Pomyślnie zmieniono hasło. Proszę pamiętać aby zmienić również ustawienia w programach skonfigurowanych do używania tego hasła."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -5910,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Aby zmienić własne hasło, proszę użyć formularza poniżej. Zmiany są "
-"wprowadzane do systemu natychmiast. Proszę zapamiętać nowe hasło, gdyż bez "
-"niego logowanie będzie niemożliwe."
+msgstr "Aby zmienić własne hasło, proszę użyć formularza poniżej. Zmiany są wprowadzane do systemu natychmiast. Proszę zapamiętać nowe hasło, gdyż bez niego logowanie będzie niemożliwe."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -5921,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Zmiana hasła jest powiązana z autentykacją do usług poczty, proxy, samba, "
-"oraz unix."
+msgstr "Zmiana hasła jest powiązana z autentykacją do usług poczty, proxy, samba, oraz unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Powtórz nowe hasło"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Ustaw hasło"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Wyczyść pola"
 
@@ -5969,55 +5841,10 @@ msgstr "Wyczyść pola"
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certyfikaty"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Standardowy certyfikat"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "certyfikat S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "certyfikat PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Nmer seryjny certyfikatu"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Osobiste zdjęcie"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Usuń obrazek"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Ustawienia użytkownika"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Nazwisko"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "ImiÄ™"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Wyczyść hasło"
@@ -6026,59 +5853,17 @@ msgstr "Wyczyść hasło"
 msgid "Set new password"
 msgstr "Ustaw nowe hasło"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Informacje osobiste"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Zmień zdjęcie"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nazwa Szablonu"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Preferowany język"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Telefon prywatny"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Przechowywanie hasła"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr "Ogranicz logowanie do"
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr "IP lub sieć"
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Informacje organizacyjne"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Numer departamentu"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Numer pracownika"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Osobiste zdjęcie"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Numer pokoju"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Zdjęcie użytkownika"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Proszę użyć zakładki telefony"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Usuń obrazek"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6095,23 +5880,6 @@ msgstr "Pokaż grupy samba"
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Pokaż serwery"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Pokaż stacje robocze"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Pokaż terminale"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6130,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr "Tekst opisujÄ…cy departament"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Zaznacz departament jako niezależną jednostkę administracyjną"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Przetwarzam zadanÄ… operacjÄ™"
@@ -6147,9 +5906,7 @@ msgstr "Przetwarzam zadanÄ… operacjÄ™"
 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ę."
+msgstr "Twoja przeglądarka nie obsługuje iframes, proszę użyć tego linku aby wykonać żądaną operację."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6225,9 +5982,7 @@ 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ć."
+msgstr "Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6272,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Tworzenie nowego użytkownika może być wspomagane przez szablony. Wiele "
-"rekordów bazy będzie automatycznie wypełnionych. Wybierz 'brak' aby pominąć "
-"użycie szablonów."
+msgstr "Tworzenie nowego użytkownika może być wspomagane przez szablony. Wiele rekordów bazy będzie automatycznie wypełnionych. Wybierz 'brak' aby pominąć użycie szablonów."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6299,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6309,20 +6061,13 @@ msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Aby zmienić hasło użytkownika, proszę użyć formularza poniżej. Zmiany są "
-"wprowadzane natychmiastowo. Proszę zapamiętać nowe hasło, gdyż bez niego "
-"zalogowanie będzie niemożliwe."
+msgstr "Aby zmienić hasło użytkownika, proszę użyć formularza poniżej. Zmiany są wprowadzane natychmiastowo. Proszę zapamiętać nowe hasło, gdyż bez niego zalogowanie będzie niemożliwe."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Siła"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6470,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6534,8 +6284,14 @@ msgstr "Nazwa grupy"
 msgid "Member objects"
 msgstr "Dodaj członka"
 
-#~ msgid "In all groups"
-#~ msgstr "We wszystkich grupach"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Pokaż serwery"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Pokaż stacje robocze"
 
-#~ msgid "Not in all groups"
-#~ msgstr "Nie we wszystkich grupach"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Pokaż terminale"
diff --git a/locale/pt/fusiondirectory.po b/locale/pt.po
similarity index 69%
rename from locale/pt/fusiondirectory.po
rename to locale/pt.po
index d52eadee57cabd8082b105f5e47db2ba8b7b5e81..93236ba60d79b60f12e708a05eb4e83d3736f579 100644
--- a/locale/pt/fusiondirectory.po
+++ b/locale/pt.po
@@ -1,54 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
-# Clever de Oliveira Jr. <clever@dri.cefetmg.br>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pt\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Portuguese (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -69,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -180,59 +178,58 @@ msgstr ""
 msgid "Warning"
 msgstr "Atenção"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
-msgstr ""
+msgstr "Erro"
 
 #: setup/class_setupStep_Migrate.inc:512 setup/class_setupStep_Migrate.inc:525
 #, php-format
@@ -240,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -289,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Criar"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Usuários"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Grupos"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
-msgstr ""
+msgstr "UID"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Erro"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Erro de LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -521,13 +505,10 @@ msgstr "Adicionar"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Remover"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -703,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -722,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -817,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -868,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -876,49 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr "Erro: Método de senha não disponível!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"A senha digitada nos campos 'Nova senha' e 'Repita nova senha' não conferem."
+msgstr "A senha digitada nos campos 'Nova senha' e 'Repita nova senha' não conferem."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -926,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Nova senha"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "A sessão não será criptografada."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Entre com a sessão SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "O alterador externo de senhas reportou um problema:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -999,134 +978,131 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Senha alterada"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Por favor, especifique um nome de usuário válido!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Por favor, especifique sua senha!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Por favor, verifique a combinação usuário / senha"
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Seu navegador está com suporte a cookies desabilitado. Por favor, habilite-o "
-"e recarregue essa página antes de entrar!"
+msgstr "Seu navegador está com suporte a cookies desabilitado. Por favor, habilite-o e recarregue essa página antes de entrar!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Informação"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1165,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Informação"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Login"
@@ -1193,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1205,9 +1178,8 @@ msgid "Password"
 msgstr "Senha"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Armazenamento da senha"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -1230,9 +1202,17 @@ msgid "Demo Plugin"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Informação pessoal"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1240,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Bem vindo %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Geral"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Correio"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1290,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Fone"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Aplicação"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Servidor"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Estação de trabalho"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1383,469 +1360,461 @@ msgstr "Configuração"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Configurações de senha"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1874,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "A senha utilizada como nova é curta."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "A senha digitada não confere com a senha atual."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Informação geral do usuário"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "feminino"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "masculino"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Nome"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Nome fornecido"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Página pessoal"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Celular"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Pager"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Data de nascimento"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Unidade"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Identificação da residência"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Vocação"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Última entrega"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Localização da pessoa"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Descrição da unidade"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Área de assunto"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Título funcional"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Visível publicamente"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Rua"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Papel"
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "CEP"
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2140,122 +1897,76 @@ msgstr ""
 msgid "User"
 msgstr "Usuário"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
-msgstr "Sobrenome"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Informação pessoal"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr "Último nome"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Primeiro nome"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Título pessoal"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Título acadêmico"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Data de nascimento"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Foto do usuário"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Organização"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2267,66 +1978,52 @@ msgstr ""
 msgid "Description"
 msgstr "Descrição"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Tipo de empregado"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Estado"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2334,306 +2031,439 @@ msgstr "Estado"
 msgid "Location"
 msgstr "Localização"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Caixa postal"
-
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "Caixa postal residencial"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Endereço"
+
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Nº da sala"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Celular"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Pager"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Informação organizacional"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Organização"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Nº do departamento"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Editar propriedades de correio"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Nº do empregado"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Editar propriedades do samba"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Editar propriedades de telefone"
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Tipo de empregado"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Ambiente"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Editar propriedades de ambiente"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "Caixa postal residencial"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Telefone privativo"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Página pessoal"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Nome"
+
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Diretório pessoal"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Grupo primário"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Estatus"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Forçar UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Membros do grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Conta"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "O usuário deve alterar sua senha no primeiro acesso"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Sistema de confiança"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Modo de confiança"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "desabilitado"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "acesso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "permitir acesso a estas máquinas"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "expirado"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "ativo"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Grupo do usuário"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2752,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2765,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr ""
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Base"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
+msgid "Postal address"
+msgstr "Caixa postal"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Continuar"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Objeto"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Continuar"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Nome do departamento"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Endereço"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2895,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "País"
 
@@ -2904,8 +2719,8 @@ msgstr "País"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2913,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Ações"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Editar"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2948,11 +2765,24 @@ msgid "List of users"
 msgstr "Lista de usuários"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Modelo"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "Sobrenome"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Nome fornecido"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2964,7 +2794,7 @@ msgstr "Modelo"
 msgid "Properties"
 msgstr "Propriedades"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Alterar senha"
@@ -2985,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -3001,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr ""
 
@@ -3018,39 +2848,39 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "nenhum"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3058,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Grupo samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Administradores do domínio"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Usuários do domínio"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Convidados do domínio"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3117,23 +2947,23 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr ""
 
@@ -3161,117 +2991,159 @@ msgstr ""
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Editar propriedades de correio"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Editar propriedades do samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Editar propriedades de telefone"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Ambiente"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Editar propriedades de ambiente"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Todas as categorias"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Um nível"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Objeto atual"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Subárvore completa"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Subárvore completa (permanente)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Para cima"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Para baixo"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Todos os objetos na subárvore atual"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Papel"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3279,10 +3151,10 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
-msgstr ""
+msgstr "ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:37
 msgid "Access control list management"
@@ -3297,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Grupos de objeto"
 
@@ -3317,51 +3189,62 @@ msgstr "Modelos"
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Fila de Telefone"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Aplicações"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Início"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Sumário FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Fila de Telefone"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Aplicações"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3391,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3422,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Referências"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Deletar esta entrada"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3495,29 +3374,29 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -3532,7 +3411,7 @@ msgid "Show %s"
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3540,102 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Grupo do usuário"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Deletar esta entrada"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Para baixo"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Nome do objeto"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3657,7 +3569,7 @@ msgstr "Selecione para listar objetos que possuem '%s' habilitado"
 msgid "Select to search within subtrees"
 msgstr "Selecione para pesquisar dentro das sub-árvores"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Procurar em subárvores"
@@ -3795,111 +3707,111 @@ msgstr "O campo '%s' contém uma palavra reservada!"
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "O comando especificado como %s, relativo ao plugin '%s', não existe!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "O comando '%s' é inválido!"
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "O comando '%s' (%s) para o plugin %s é inválido!"
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "O comando '%s' para o plugin %s is invalid!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "O comando '%s' (%s) é inválido!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "Não foi possível executar o comando '%s'!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "O comando '%s' (%s) para o plugin %s é inválido!"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Não foi possível executar o comando '%s' (%s) para o plugin %s!"
+msgid "Cannot execute '%s' command!"
+msgstr "Não foi possível executar o comando '%s'!"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Não foi possível executar o comando '%s' para o plugin %s!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Não foi possível executar o comando '%s' (%s) para o plugin %s!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3912,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3924,300 +3835,300 @@ msgstr "Cancelar"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Aplicar"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Salvar"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Definir"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Voltar"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Clique em Editar para alterar as informações desta janela"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Janeiro"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Fevereiro"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Março"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Abril"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Maio"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Junho"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Julho"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Agosto"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Setembro"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Outubro"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Novembro"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Dezembro"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Domingo"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Segunda"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Terça"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Quinta"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Sexta"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Sábado"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4238,104 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Impossível colar"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Erro de XML no fusiondirectory.conf: %s na linha %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Não foi possível realizar bind para o LDAP. Por favor, contacte o "
-"administrador do sistema."
+msgstr "Não foi possível realizar bind para o LDAP. Por favor, contacte o administrador do sistema."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID e/ou sambaRidBase não configurado!"
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Todas as categorias"
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Minha conta"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Submeter"
 
@@ -4348,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "de"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Limpar ACLs"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Use ACL definida na regra"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Nenhuma configuração de ACL para essa categoria!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Contém ACLs para estes objetos: %s"
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "Categoria ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s' - o escopo é '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Exibir/Ocultar configurações avançadas"
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Criar objetos"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Mover objetos"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Remover objetos"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr "Conceder permissão para o dono"
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "leitura"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "escrita"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "Objeto completo"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "Tipo de ACL desconhecida '%s'!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entrada desconhecida '%s'!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Regra: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "regra desconhecida"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Contém configurações para estes objetos: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Membros"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Gerenciar listas de controle de acesso"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "Regras de ACL"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Ir para departamento de usuários"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4563,299 +4475,288 @@ msgstr ""
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"A configuração do fuso horário '%s' no fusiondirectory.conf não é válida. "
-"Não foi possível calcular o intervalo do fuso horário corretamente."
+msgstr "A configuração do fuso horário '%s' no fusiondirectory.conf não é válida. Não foi possível calcular o intervalo do fuso horário corretamente."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Alerta de performance"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
-msgstr ""
-"A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
+msgstr "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Não foi possível criar subárvores automaticamente com RDN '%s': classe de "
-"objeto não encontrada!"
+msgstr "Não foi possível criar subárvores automaticamente com RDN '%s': classe de objeto não encontrada!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
-msgstr ""
-"Não foi possível criar subárvores automaticamente com '%s': não suportado"
+msgstr "Não foi possível criar subárvores automaticamente com '%s': não suportado"
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "enquanto executava em '%s' usando LDAP server '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "enquanto executava no LDAP server %s"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Esse não é um DN válido: '%s'. O bloco para importação deve iniciar com "
-"'dn: ...' na linha %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Esse não é um DN válido: '%s'. O bloco para importação deve iniciar com 'dn: ...' na linha %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Erro enquanto importava dn: '%s', por favor, verifique seu LDIF na linha %s!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Erro enquanto importava dn: '%s', por favor, verifique seu LDIF na linha %s!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Todos os objetos nessa categoria"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
-msgstr ""
-"O formato da configuração foi alterado. Por favor, execute novamente o "
-"configurador!"
+msgstr "O formato da configuração foi alterado. Por favor, execute novamente o configurador!"
 
 #: include/class_databaseManagement.inc:80
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4915,7 +4816,6 @@ msgstr "Clique aqui para logar"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4925,6 +4825,7 @@ msgstr "Clique aqui para logar"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
 
@@ -4936,14 +4837,14 @@ msgstr "Conflito de sessão detectado"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:14
@@ -4976,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4996,9 +4897,9 @@ msgstr "Nova senha repetida"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5111,9 +5012,7 @@ msgstr ""
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+msgstr "Então, se você tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' para abortar."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5124,10 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Se esta detecção for falsa, um usuário pode ter fechado o navegador durante "
-"a operação de edição. Você pode destravar pressionando o botão 'Editar mesmo "
-"assim'."
+msgstr "Se esta detecção for falsa, um usuário pode ter fechado o navegador durante a operação de edição. Você pode destravar pressionando o botão 'Editar mesmo assim'."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5135,9 +5031,9 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
 
@@ -5221,10 +5117,6 @@ msgstr "Logado:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5247,17 +5139,17 @@ msgstr "Altere sua senha"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Senha atual"
 
@@ -5424,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5567,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "Recarregar"
 
@@ -5589,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5611,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5672,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5686,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5702,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5835,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5886,9 +5779,7 @@ msgstr ""
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Sua senha foi alterada com sucesso. Lembre-se de alterar todos os programas "
-"que a usem."
+msgstr "Sua senha foi alterada com sucesso. Lembre-se de alterar todos os programas que a usem."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -5901,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Para alterar sua senha pessoal, use os campos abaixo. As alterações terão "
-"efeito imediato. Por favor, memorize a nova senha porque você não será capaz "
-"de acessar o sistema sem ela."
+msgstr "Para alterar sua senha pessoal, use os campos abaixo. As alterações terão efeito imediato. Por favor, memorize a nova senha porque você não será capaz de acessar o sistema sem ela."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -5912,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Alteração de senha afeta a autenticação dos serviços de correio, proxy, "
-"samba e unix."
+msgstr "Alteração de senha afeta a autenticação dos serviços de correio, proxy, samba e unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Repita nova senha"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Definir a senha"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Limpar campos"
 
@@ -5960,55 +5841,10 @@ msgstr "Limpar campos"
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Certificados"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Certificado padrão"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Certificado S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Certificado PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Número serial do certificado"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Foto pessoal"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Remover foto"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Configurações do usuário"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Último nome"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Primeiro nome"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Senha limpa"
@@ -6017,59 +5853,17 @@ msgstr "Senha limpa"
 msgid "Set new password"
 msgstr "Definir nova senha"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Informação pessoal"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Alterar foto"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Nome modelo"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Linguagem preferida"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Telefone privativo"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Armazenamento da senha"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Informação organizacional"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Nº do departamento"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Nº do empregado"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Foto pessoal"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Nº da sala"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Foto do usuário"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Por favor, utilize a orelha telefone"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Remover foto"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6086,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6121,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6214,10 +5982,7 @@ 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."
+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."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6262,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"A criação de usuários pode ser assistida pelo uso de modelos. Muitos campos "
-"podem ser preenchidos automaticamente. Escolha 'nenhum' para não utilizar "
-"modelos."
+msgstr "A criação de usuários pode ser assistida pelo uso de modelos. Muitos campos podem ser preenchidos automaticamente. Escolha 'nenhum' para não utilizar modelos."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6289,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6299,20 +6061,13 @@ msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Para alterar a senha do usuário utilize os campos abaixo. As alterações "
-"surtem efeito imediatamente. Por favor, memorize a nova senha porque o "
-"usuário não será capaz de acessar o sistema sem ela."
+msgstr "Para alterar a senha do usuário utilize os campos abaixo. As alterações surtem efeito imediatamente. Por favor, memorize a nova senha porque o usuário não será capaz de acessar o sistema sem ela."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6460,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6523,3 +6283,15 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/ru/fusiondirectory.po b/locale/ru.po
similarity index 70%
rename from locale/ru/fusiondirectory.po
rename to locale/ru.po
index b1dd48852f8d30a31f772c3a4b996d36d2b12a95..439e2944e95e9be9f7e6e39b08205735723747fd 100644
--- a/locale/ru/fusiondirectory.po
+++ b/locale/ru.po
@@ -1,56 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # 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\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/ru/)\n"
-"Language: ru\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/FusionDirectory/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -71,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -182,57 +178,56 @@ msgstr ""
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Ошибка"
 
@@ -242,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -291,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Создать"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Пользователи"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Группы"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
-msgstr ""
+msgstr "UID"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Ошибка LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Добавить"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -523,13 +505,10 @@ msgstr "Добавить"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Удалить"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -705,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -724,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -819,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -870,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -878,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -927,67 +905,67 @@ msgstr "Введенные пароли не совпадают!"
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Новый пароль"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1000,132 +978,131 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Введите корректное имя пользователя!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Введите свой пароль!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Информация"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1164,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Информация"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Имя пользователя"
@@ -1192,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1204,9 +1178,8 @@ msgid "Password"
 msgstr "Пароль"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Хэширование паролей"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -1218,7 +1191,7 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
@@ -1229,9 +1202,17 @@ msgid "Demo Plugin"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Личная информация"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1239,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Добро пожаловать %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Общее"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "Unix"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Почта"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "Факс"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Прокси-сервер"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1289,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Подразделение"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Телефон"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Приложение"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Сервер"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Тонкий клиент"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Объект группы"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1382,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "Дополнительно"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "Язык"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1873,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "Новый пароль слишком короткий."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "Введенный вами текущий пароль не совпадает с реальным."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Общая информация о пользователе"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "женский"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "мужской"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Фамилия"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Имя"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Домашняя страница"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Факс"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Мобильный"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Пейджер"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Дата рождения"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Подразделение"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Номер дома"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Специальность"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Последняя доставка"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Местоположение сотрудника"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Описание подразделения"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Область деятельности"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Должность"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Видимый всем"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Улица"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Роль"
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Почтовый индекс"
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2139,122 +1897,76 @@ msgstr ""
 msgid "User"
 msgstr "Пользователь"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Личная информация"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Дата рождения"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Пол"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Ветка"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Организация"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2266,66 +1978,52 @@ msgstr ""
 msgid "Description"
 msgstr "Описание"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Форма трудоустройства"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Адм. единица"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2333,306 +2031,439 @@ msgstr "Адм. единица"
 msgid "Location"
 msgstr "Местоположение"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Адм. единица"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Адрес"
+
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Номер комнаты"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Пейджер"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Факс"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Информация об организации"
+
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Организация"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Номер подразделения"
+
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Номер работника"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Форма трудоустройства"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Личный телефон"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Окружение"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Домашняя страница"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Фамилия"
+
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Оболочка"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Основная группа"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Состояние"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Указать UID/GID вручную"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Членство в группах"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Учетная запись"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "Пользователь должен сменить пароль при первом входе в систему"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Системные доверия"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "отключен"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "полный доступ"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "Не настроено"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "автоматически"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Группа пользователя"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2751,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2764,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Категория"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr ""
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Ветка"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
+msgid "Postal address"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Продолжить"
-
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "Объект"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Продолжить"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Подразделения"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Адрес"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Телефон"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "Домен"
 
@@ -2894,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Страна"
 
@@ -2903,8 +2719,8 @@ msgstr "Страна"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2912,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Действия"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Изменить"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2947,11 +2765,24 @@ msgid "List of users"
 msgstr "Список пользователей"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Шаблон"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Имя"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2963,7 +2794,7 @@ msgstr "Шаблон"
 msgid "Properties"
 msgstr "Свойства"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Сменить пароль"
@@ -2984,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -3000,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr ""
 
@@ -3017,39 +2848,39 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3057,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Администраторы домена"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Непривилегированные пользователи домена"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3116,23 +2947,23 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr ""
 
@@ -3148,16 +2979,62 @@ msgstr ""
 msgid "Group menu entry"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:147
-msgid "Edit group"
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:160
-msgid "Remove group"
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Окружение"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
@@ -3166,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "Доступ"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Удалить"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Роль"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3278,10 +3151,10 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
-msgstr ""
+msgstr "Доступ"
 
 #: plugins/admin/acl/class_aclManagement.inc:37
 msgid "Access control list management"
@@ -3296,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Объединения"
 
@@ -3316,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Приложения"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Устройства"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Запуск"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Системы"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Приложения"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3390,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3421,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Ссылки"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr ""
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
-msgstr ""
+msgstr "в"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3494,29 +3374,29 @@ msgstr "Тип"
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr ""
 
@@ -3526,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Показать серверы"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3539,100 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Группа пользователя"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Имя объекта"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3654,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3792,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3909,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3921,300 +3835,300 @@ msgstr "Отмена"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Применить"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Сохранить"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Установить"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Назад"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Январь"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Февраль"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Март"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Апрель"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Май"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Июнь"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Июль"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Август"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Сентябрь"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Октябрь"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Ноябрь"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Декабрь"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4235,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Ошибка XML в fusiondirectory.conf: %s в строке %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr ""
 
@@ -4343,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr ""
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "чтение"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "запись"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4560,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4623,225 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Установить новое значение лимита в %s и показать мне это сообщение если "
-"лимит будет исчерпан."
+msgstr "Установить новое значение лимита в %s и показать мне это сообщение если лимит будет исчерпан."
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4901,7 +4816,6 @@ msgstr "Нажмите на эту кнопку, чтобы войти в сис
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4911,6 +4825,7 @@ msgstr "Нажмите на эту кнопку, чтобы войти в сис
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "Фильтр"
 
@@ -4922,17 +4837,15 @@ msgstr "Конфликт сеансов"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Если вы ничего не предпримете, редактируемые вами данные не будут сохранены, "
-"поэтому закройте все окна, кроме одного, и начните сеанс заново."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Если вы ничего не предпримете, редактируемые вами данные не будут сохранены, поэтому закройте все окна, кроме одного, и начните сеанс заново."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -4964,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4984,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5081,7 +4994,7 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
-msgstr ""
+msgstr "Дата"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:41
 msgid "Reason for generating this snapshot"
@@ -5118,16 +5031,11 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
-"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
-"снизить время обработки запроса при обслуживаии большой базы данных это "
-"установить минимальное значение. Кроме того, будет очень полезно "
-"использовать фильтры для просмотра только ограниченного количества объектов."
+msgstr "Ограничение на количество возвращаемых объектов позволяет ускорить операции поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ снизить время обработки запроса при обслуживаии большой базы данных это установить минимальное значение. Кроме того, будет очень полезно использовать фильтры для просмотра только ограниченного количества объектов."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5209,10 +5117,6 @@ msgstr "Пользователь:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5235,17 +5139,17 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Текущий пароль"
 
@@ -5412,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5555,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5577,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5599,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5660,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5674,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5690,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5823,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5874,9 +5779,7 @@ msgstr "Данный объект не имеет ссылок на другие
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Вы успешно сменили свой пароль. Не забудьте изменить нужные настройки "
-"использующих его программ."
+msgstr "Вы успешно сменили свой пароль. Не забудьте изменить нужные настройки использующих его программ."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -5904,38 +5807,33 @@ msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Подтверждение"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Изменить пароль"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Очистить поля"
 
@@ -5943,55 +5841,10 @@ msgstr "Очистить поля"
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Сертификаты"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Стандартный сертификат"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Сертификат S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Сертификат PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Серийный номер сертификата"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Изображение"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Удалить изображение"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr ""
@@ -6000,59 +5853,17 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Личная информация"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Сменить изображение"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Личный телефон"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Хэширование паролей"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Изображение"
 
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Информация об организации"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Номер подразделения"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Номер работника"
-
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Номер комнаты"
-
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Воспользуйтесь закладкой \"Телефон\""
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Удалить изображение"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6069,23 +5880,6 @@ msgstr "Показать группы samba"
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "Показать серверы"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "Показать рабочие станции"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "Показать терминалы"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6104,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr "Описание подразделения"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6266,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6278,15 +6063,11 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6319,9 +6100,7 @@ msgstr "Имя группы, соответствующее стандарту P
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Обычно идентификаторы создаются автоматически, но вы можете выбрать указание "
-"вручную"
+msgstr "Обычно идентификаторы создаются автоматически, но вы можете выбрать указание вручную"
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6436,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6499,3 +6283,15 @@ msgstr "Название группы"
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr "Включаемые объекты"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "Показать серверы"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "Показать рабочие станции"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "Показать терминалы"
diff --git a/locale/ug/fusiondirectory.po b/locale/ug.po
similarity index 69%
rename from locale/ug/fusiondirectory.po
rename to locale/ug.po
index 35af6deab839c3d1ea7598e40529445fac99704c..aeca10fc9de682c9d9b5c04b74f59395ce952007 100644
--- a/locale/ug/fusiondirectory.po
+++ b/locale/ug.po
@@ -1,54 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: FusionDirectory\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/ug/)\n"
-"Language: ug\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Uighur (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -69,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -180,57 +178,56 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr ""
 
@@ -240,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -289,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -521,13 +505,10 @@ msgstr ""
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -703,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -722,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -817,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -868,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -876,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -925,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -998,123 +978,123 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr ""
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr ""
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -1169,16 +1149,12 @@ msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr ""
@@ -1188,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1227,54 +1205,63 @@ msgstr ""
 msgid "Edit some useless personal information"
 msgstr ""
 
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
+
 #: plugins/generic/welcome/main.inc:26
 #, php-format
 msgid "Welcome %s!"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1283,65 +1270,62 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1376,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1867,407 +1843,296 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
+#: plugins/personal/generic/class_user.inc:142
+msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
+#: plugins/personal/generic/class_user.inc:146
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
+#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
+msgid "User"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
+#: plugins/personal/generic/class_user.inc:175
+msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
+#: plugins/personal/generic/class_user.inc:179
+msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
+#: plugins/personal/generic/class_user.inc:193
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+#: plugins/admin/departments/class_organizationGeneric.inc:95
+#: plugins/admin/departments/class_organizationGeneric.inc:126
+#: plugins/admin/departments/class_dcObject.inc:63
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
+#: plugins/admin/departments/class_domain.inc:63
+#: plugins/admin/departments/class_domain.inc:95
+#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/departments/class_countryGeneric.inc:63
+#: plugins/admin/departments/class_countryGeneric.inc:94
+#: plugins/admin/departments/class_localityGeneric.inc:64
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:66
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
+#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
+#: include/simpleplugin/simple-list.xml:40
+#: include/class_SnapShotDialog.inc:230
+#: plugins/generic/references/contents.tpl.c:5
+#: plugins/admin/departments/dcObject.tpl.c:11
+#: plugins/admin/departments/locality.tpl.c:11
+#: plugins/admin/departments/country.tpl.c:11
+#: plugins/admin/departments/organization.tpl.c:11
+#: plugins/admin/departments/generic.tpl.c:11
+#: plugins/admin/departments/domain.tpl.c:11
+#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
+#: plugins/admin/ogroups/generic.tpl.c:8
+msgid "Description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
+#: plugins/admin/departments/organization.tpl.c:29
+#: plugins/admin/departments/organization.tpl.c:38
+#: plugins/admin/departments/generic.tpl.c:29
+#: plugins/admin/departments/generic.tpl.c:38
+msgid "Location"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
-msgid "Generic user settings"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
-#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
-#: plugins/admin/groups/userSelect/user-list.xml:14
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:14
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
-#: setup/setup_config2.tpl.c:20 setup/setup_config2.tpl.c:35
-msgid "User"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
-msgid "Personal title"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:272
 #: plugins/admin/departments/class_organizationGeneric.inc:114
 #: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
+#: plugins/admin/departments/class_organizationGeneric.inc:120
 #: plugins/admin/departments/dep-list.xml:47
 #: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
 msgid "Organization"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:280
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
-#: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
-#: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
-#: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
-#: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
-#: plugins/admin/departments/dep-list.xml:79
-#: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
-#: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
-#: plugins/admin/departments/dcObject.tpl.c:11
-#: plugins/admin/departments/locality.tpl.c:11
-#: plugins/admin/departments/country.tpl.c:11
-#: plugins/admin/departments/organization.tpl.c:11
-#: plugins/admin/departments/generic.tpl.c:11
-#: plugins/admin/departments/domain.tpl.c:11
-#: plugins/admin/groups/generic.tpl.c:8 plugins/admin/acl/acl_role.tpl.c:8
-#: plugins/admin/ogroups/generic.tpl.c:8
-msgid "Description"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
 #: plugins/admin/departments/dcObject.tpl.c:20
 #: plugins/admin/departments/locality.tpl.c:20
 #: plugins/admin/departments/country.tpl.c:20
@@ -2277,355 +2142,327 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
-#: plugins/admin/departments/organization.tpl.c:29
-#: plugins/admin/departments/organization.tpl.c:38
-#: plugins/admin/departments/generic.tpl.c:29
-#: plugins/admin/departments/generic.tpl.c:38
-msgid "Location"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1412
+#: plugins/personal/generic/class_user.inc:306
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
 msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
 #: plugins/admin/groups/userSelect/user-list.xml:10
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
 msgid "Please select the desired entries"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
@@ -2745,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2758,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
+msgid "Postal address"
+msgstr ""
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
 msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2888,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr ""
 
@@ -2897,8 +2719,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2906,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr ""
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr ""
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2941,11 +2765,24 @@ msgid "List of users"
 msgstr ""
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr ""
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr ""
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2957,7 +2794,7 @@ msgstr ""
 msgid "Properties"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr ""
@@ -2978,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -2994,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr ""
 
@@ -3011,39 +2848,39 @@ msgstr ""
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3051,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3110,48 +2947,94 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
-msgid "Group member"
+#: plugins/admin/groups/class_group.inc:1128
+msgid "Group member"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:23
+msgid "Group submenu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:31
+msgid "Group menu entry"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:147
+msgid "Edit group"
+msgstr ""
+
+#: plugins/admin/groups/group-list.xml:160
+msgid "Remove group"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:23
-msgid "Group submenu entry"
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:31
-msgid "Group menu entry"
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:147
-msgid "Edit group"
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/groups/group-list.xml:160
-msgid "Remove group"
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
 msgstr ""
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
@@ -3160,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3272,7 +3151,7 @@ msgstr ""
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr ""
@@ -3290,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr ""
 
@@ -3310,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3384,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3415,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr ""
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr ""
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3488,29 +3374,29 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr ""
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr ""
 
@@ -3525,7 +3411,7 @@ msgid "Show %s"
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3533,99 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr ""
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3647,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr ""
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3785,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3902,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr ""
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3914,300 +3835,300 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr ""
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr ""
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr ""
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr ""
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr ""
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr ""
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr ""
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4228,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr ""
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr ""
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr ""
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr ""
 
@@ -4336,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr ""
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr ""
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr ""
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr ""
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr ""
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr ""
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4553,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4616,223 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4892,7 +4816,6 @@ msgstr ""
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4902,6 +4825,7 @@ msgstr ""
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
 
@@ -4913,14 +4837,14 @@ msgstr ""
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:14
@@ -4953,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4973,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5107,9 +5031,9 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
 msgstr ""
 
@@ -5193,10 +5117,6 @@ msgstr ""
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5219,17 +5139,17 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr ""
 
@@ -5396,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5539,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5561,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5583,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5644,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5658,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5674,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5807,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5886,38 +5807,33 @@ msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr ""
 
@@ -5925,55 +5841,10 @@ msgstr ""
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr ""
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr ""
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr ""
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr ""
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr ""
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr ""
@@ -5982,58 +5853,16 @@ msgstr ""
 msgid "Set new password"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
 msgstr ""
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
@@ -6051,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6086,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr ""
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr ""
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr ""
@@ -6248,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6260,15 +6063,11 @@ msgid ""
 "able to login without it."
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6416,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6479,3 +6283,15 @@ msgstr ""
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/vi/fusiondirectory.po b/locale/vi_VN.po
similarity index 68%
rename from locale/vi/fusiondirectory.po
rename to locale/vi_VN.po
index 12b91db34de4dfdc54ad9c75e69cfb334fb53683..194e0d120f505cda8160ed163470078a063a89f0 100644
--- a/locale/vi/fusiondirectory.po
+++ b/locale/vi_VN.po
@@ -1,54 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # 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\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "Không"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "Có"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr "Lỗi cài đặt"
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr "Khoảng thời gian của phiên phải là một giá trị số!"
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr "Thời gian tối đa để yêu cầu LDAP phải là một giá trị số!"
 
@@ -69,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr "Bước này cho phép bạn lựa chọn ngôn ngữ bạn muốn dùng."
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr "Tự động"
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr "Thanh tra LDAP"
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr "Kiểm tra đối tượng gốc"
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr "Kiểm tra các bộ phận ẩn"
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr "Kiểm tra những người dùng ẩn"
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr "Kiểm tra siêu admin"
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr "Kiểm tra người dùng bên ngoài cây con người"
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr "Kiểm tra nhóm bên ngoài cây nhóm"
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr "Kiểm tra các số ID cuả người dùng (UID) được nhân bản"
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr "Kiểm tra các số ID của nhóm (GID) được nhân bản"
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr "Yêu cầu LDAP thất bại"
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr "Có thể 'đối tượng gốc' bị mất tích."
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -180,57 +178,56 @@ msgstr "Có thể 'đối tượng gốc' bị mất tích."
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr "Đã tìm được %s giá trị nhân bản cho thuộc tính  'uidNumder'."
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "Ok"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr "Đã tìm được %s giá trị nhân bản cho thuộc tính  'gidNumder'."
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr "Đã tìm thấy %s nhóm bên ngoài cây được cấu hình '%s'."
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr "Chuyển"
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr "Đã tìm thấy %s người dùng  bên ngoài cây được cấu hình '%s'."
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "Thất bại"
 
@@ -238,51 +235,51 @@ msgstr "Thất bại"
 #, php-format
 msgid ""
 "The specified user '%s' does not have full access to your ldap database."
-msgstr ""
-"Người dùng '%s' không có toàn quyền truy cập vào cơ sở dữ liệu LDAP của bạn."
+msgstr "Người dùng '%s' không có toàn quyền truy cập vào cơ sở dữ liệu LDAP của bạn."
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr "Di trú"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr "Lỗi di trú"
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr "Không thể di trú bộ phận '%s':"
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -290,234 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "Tạo "
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "Người dùng"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "Các nhóm"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr "Không thể thêm ACL cho người dùng '%s':"
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr "Lỗi nhập vào"
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr "Lỗi mật mã"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr "Những mật khẩu được cung cấp không phù hợp!"
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr "Xác định một ID người dùng hợp lệ!"
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "Lá»—i"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr ""
-"Việc thêm một người dùng quản trị đã thất bại: đối tượng '%s' đã có rồi!"
-
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+msgstr "Việc thêm một người dùng quản trị đã thất bại: đối tượng '%s' đã có rồi!"
+
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "Lá»—i LDAP"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr "Không thể chuyển người dùng đến bộ phận được yêu cầu!"
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr "Nhóm sẽ được chuyển từ"
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr "đến"
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr "Cập nhật cả các tham chiếu sau"
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr "Người dùng sẽ được chuyển từ"
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr "Tham chiếu sau sẽ được cập nhật"
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
-msgstr ""
-"Đối tượng gốc LDAP đang mất tích. Để sử dụng dịch vụ LDAP của bạn, bạn cần "
-"có nó."
+msgstr "Đối tượng gốc LDAP đang mất tích. Để sử dụng dịch vụ LDAP của bạn, bạn cần có nó."
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr "Cố tạo ra một đối tượng gốc"
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr "Đối tượng gốc không thể được tạo ra, bạn phải cố tự mình tạo ra nó."
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr "Sao chép '%s' đến '%s' bị thất bại:"
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "Thêm vào"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -525,13 +505,10 @@ msgstr "Thêm vào"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "Xóa bỏ"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -643,37 +620,27 @@ msgid ""
 "register_globals is a PHP mechanism to register all global variables to be "
 "accessible from scripts without changing the scope. This may be a security "
 "risk."
-msgstr ""
-"đăng ký_toàn cầu (register_globals) là một cơ chế PHP dùng để đăng ký tất cả "
-"các biến số toàn cầu mà có thể truy cập từ các tập lệnh mà không phải thay "
-"đổi phạm vi. Đây có thể là một rủi ro về bảo mật."
+msgstr "đăng ký_toàn cầu (register_globals) là một cơ chế PHP dùng để đăng ký tất cả các biến số toàn cầu mà có thể truy cập từ các tập lệnh mà không phải thay đổi phạm vi. Đây có thể là một rủi ro về bảo mật."
 
 #: setup/class_setupStep_Checks.inc:167
 msgid "Search for 'register_globals' in your php.ini and switch it to 'Off'."
-msgstr ""
-"Tìm kiếm 'register_globals' trong thư mục php.ini của bạn và chuyển nó thành "
-"'Off'."
+msgstr "Tìm kiếm 'register_globals' trong thư mục php.ini của bạn và chuyển nó thành 'Off'."
 
 #: setup/class_setupStep_Checks.inc:175
 msgid "PHP uses this value for the garbage collector to delete old sessions."
-msgstr ""
-"PHP sử dụng giá trị này để phần mềm thu dọn rác có thể sóa các phiên cũ đi."
+msgstr "PHP sử dụng giá trị này để phần mềm thu dọn rác có thể sóa các phiên cũ đi."
 
 #: setup/class_setupStep_Checks.inc:176
 msgid ""
 "Setting this value to one day will prevent loosing session and cookies "
 "before they really timeout."
-msgstr ""
-"Thiết lập giá trị này đến một ngày sẽ ngăn cản việc mất đi các phiên và "
-"cookies trước khi chúng thực sự hết hạn."
+msgstr "Thiết lập giá trị này đến một ngày sẽ ngăn cản việc mất đi các phiên và cookies trước khi chúng thực sự hết hạn."
 
 #: setup/class_setupStep_Checks.inc:177
 msgid ""
 "Search for 'session.gc_maxlifetime' in your php.ini and set it to 86400 or "
 "higher."
-msgstr ""
-"Tìm kiếm  'session.gc_maxlifetime' trong thư mục php.ini của bạn và thiết "
-"lập nó đển 86400 hoặc cao hơn."
+msgstr "Tìm kiếm  'session.gc_maxlifetime' trong thư mục php.ini của bạn và thiết lập nó đển 86400 hoặc cao hơn."
 
 #: setup/class_setupStep_Checks.inc:184 setup/class_setupStep_Checks.inc:200
 #: setup/class_setupStep_Checks.inc:216 setup/class_setupStep_Checks.inc:224
@@ -688,9 +655,7 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:186
 msgid "Search for 'session.auto_start' in your php.ini and set it to 'Off'."
-msgstr ""
-"Tìm kiếm  'session.auto_start' trong thư mục php.ini của bạn và đặt nó thành "
-"'Off'."
+msgstr "Tìm kiếm  'session.auto_start' trong thư mục php.ini của bạn và đặt nó thành 'Off'."
 
 #: setup/class_setupStep_Checks.inc:193
 msgid ""
@@ -707,15 +672,11 @@ msgstr ""
 msgid ""
 "This option influences the PHP output handling. Turn this Option off, to "
 "increase performance."
-msgstr ""
-"Lựa chọn này sẽ ảnh hưởng tới việc sử lý đầu vào PHP. Tắt chức năng này đi, "
-"để tăng khả năng hoạt động."
+msgstr "Lựa chọn này sẽ ảnh hưởng tới việc sử lý đầu vào PHP. Tắt chức năng này đi, để tăng khả năng hoạt động."
 
 #: setup/class_setupStep_Checks.inc:202
 msgid "Search for 'implicit_flush' in your php.ini and set it to 'Off'."
-msgstr ""
-"Tìm kiếm 'implicit_flush' trong thư mục php.ini của bạn và chuyển nó sang "
-"'Off'."
+msgstr "Tìm kiếm 'implicit_flush' trong thư mục php.ini của bạn và chuyển nó sang 'Off'."
 
 #: setup/class_setupStep_Checks.inc:209
 msgid "The Execution time should be at least 30 seconds."
@@ -723,38 +684,29 @@ msgstr "Thời gian chạy ít nhất là 30 giây."
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
-msgstr ""
-"Tìm kiếm 'max_execution_time' trong thư mục php.ini của bạn và thiết lập nó "
-"đến '30' hoặc cao hơn."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
+msgstr "Tìm kiếm 'max_execution_time' trong thư mục php.ini của bạn và thiết lập nó đến '30' hoặc cao hơn."
 
 #: setup/class_setupStep_Checks.inc:217
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any information about the server you are running in this case."
-msgstr ""
-"Tăng tính bảo mật của server bằng việc thiết lập expose_php thành 'off'. PHP "
-"sẽ không gửi bất cứ thông tin nào về server bạn đang chạy trong trường hợp "
-"này."
+msgstr "Tăng tính bảo mật của server bằng việc thiết lập expose_php thành 'off'. PHP sẽ không gửi bất cứ thông tin nào về server bạn đang chạy trong trường hợp này."
 
 #: setup/class_setupStep_Checks.inc:218
 msgid "Search for 'expose_php' in your php.ini and set if to 'Off'."
-msgstr ""
-"Tìm kiếm 'expose_php' trong thư much php.ini của bạn và chuyển nó thành "
-"'Off'."
+msgstr "Tìm kiếm 'expose_php' trong thư much php.ini của bạn và chuyển nó thành 'Off'."
 
 #: setup/class_setupStep_Checks.inc:225
 msgid "Increase your server performance by setting magic_quotes_gpc to 'off'."
-msgstr ""
-"Tăng cường khả năng hoạt động cho server của bạn bằng việc thiết lập "
-"magic_quotes_gpc thành 'off'."
+msgstr "Tăng cường khả năng hoạt động cho server của bạn bằng việc thiết lập magic_quotes_gpc thành 'off'."
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
-msgstr ""
-"Tìm kiếm 'zend.ze1_compatibility_mode' trong thư mục  php.ini và chuyển nó "
-"thành 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
+msgstr "Tìm kiếm 'zend.ze1_compatibility_mode' trong thư mục  php.ini và chuyển nó thành 'Off'."
 
 #: setup/class_setupStep_Checks.inc:236
 msgid "Configuration writeable"
@@ -834,9 +786,7 @@ msgstr "Kết thúc - viết file cấu hình"
 msgid ""
 "Your configuration file is currently world readable. Please update the file "
 "permissions!"
-msgstr ""
-"File cấu hình của bạn hiện cả thế giới đều đọc được. Xin hãy cập nhật quyền "
-"truy cập file!"
+msgstr "File cấu hình của bạn hiện cả thế giới đều đọc được. Xin hãy cập nhật quyền truy cập file!"
 
 #: setup/class_setupStep_Finish.inc:105
 msgid "The configuration is currently not readable or it does not exists."
@@ -850,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr "Đã hoàn thành"
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr "Tiếp tục"
 
@@ -901,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr "Gía trị khác của mật khẩu cho trước không phải là số."
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr "Phương pháp lập mật khẩu"
 
@@ -909,51 +859,45 @@ msgstr "Phương pháp lập mật khẩu"
 msgid "Error: Password method not available!"
 msgstr "Lỗi: Phương pháp mật khẩu không có!"
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr "Lỗi nặng"
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
-msgstr ""
-"Không thể truy cập vào thư mục '%s' được xác định là thư mục soạn thảo!"
+msgstr "Không thể truy cập vào thư mục '%s' được xác định là thư mục soạn thảo!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
-msgstr ""
-"Các mật khẩu bạn vừa nhập vào: \"Mật khẩu mới\" và \"Mật khẩu lặp lại\" "
-"không giống nhau."
+msgstr "Các mật khẩu bạn vừa nhập vào: \"Mật khẩu mới\" và \"Mật khẩu lặp lại\" không giống nhau."
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -961,67 +905,67 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "Phiên sẽ không được mã hóa."
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "Vào phiên SSL"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "Bộ thay đổi mật khẩu bên ngoài báo cáo một vấn đề: "
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -1034,141 +978,131 @@ msgstr "Smarty"
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr "Không thể xác định vị trí file '%s'- xin hãy chạy '%s' để sửa lỗi này!"
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr "Cấu hình PHP"
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr "Thay đổi mật khẩu"
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr "Mật khẩu của bạn chuẩn bị hết hạn, xin hãy thay đối mật khẩu của bạn!"
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr "Hết dung lượng bộ nhớ!"
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr "Vô hiệu việc kiểm tra ACL của người dùng"
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr "Plugin"
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr "Phiên không được mã hóa!"
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
-msgstr ""
-"Thời gian hạn định của phiên được cấu hình trong file fusiondirectory.conf "
-"của bạn sẽ được ghi đè lên bởi các thiết lập php.ini."
+msgstr "Thời gian hạn định của phiên được cấu hình trong file fusiondirectory.conf của bạn sẽ được ghi đè lên bởi các thiết lập php.ini."
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr "Lá»—i Smarty"
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr "Có vấn đề với  việc cài đặt chức năng xác định thẩm quyền!"
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
-msgstr ""
-"Không thể tìm thấy một người dùng hợp lệ cho việc cài đặt xác định thẩm "
-"quyền hiện tại!"
+msgstr "Không thể tìm thấy một người dùng hợp lệ cho việc cài đặt xác định thẩm quyền hiện tại!"
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr "Không thể tìm ra thông tin về lược đồ  LDAP đã được cài đặt!"
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr "Cài đặt LDAP của bạn có chứa các định nghĩa lược đồ cũ:"
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "Xin hãy xác định một tên người dùng hợp lệ!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "Xin hãy xác định mật mã của bạn!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr "Lỗi xác định thẩm quyền"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
-msgstr ""
-"Không thể phục hồi thông tin của người dùng cho việc thẩm  định quyền "
-"htaccess (truy cập ht)!"
+msgstr "Không thể phục hồi thông tin của người dùng cho việc thẩm  định quyền htaccess (truy cập ht)!"
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "Xin hãy kiểm tra kết hợp tên người dùng/mật khẩu."
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
-msgstr ""
-"Tài khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
+msgstr "Tài khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
-msgstr ""
-"Trình duyệt của bạn đã vô hiệu cookies. Xin hãy cho phép cookies vào và tải "
-"lại trang này trước khi đăng nhập!"
+msgstr "Trình duyệt của bạn đã vô hiệu cookies. Xin hãy cho phép cookies vào và tải lại trang này trước khi đăng nhập!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "Thông tin"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1179,9 +1113,8 @@ msgid "Color of the hair"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:54
-#, fuzzy
 msgid "Length"
-msgstr "Cường độ"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:55
 msgid "Length of the hair in cm"
@@ -1208,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "Thông tin Toggle"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "Đăng nhập"
@@ -1236,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1248,9 +1178,8 @@ msgid "Password"
 msgstr "Mật khẩu"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "Lỗi mật mã"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -1269,14 +1198,21 @@ msgid "Port for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:107
-#, fuzzy
 msgid "Demo Plugin"
-msgstr "Plugin"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "Thông tin cá nhân"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1284,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "Chào mừng %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "Thông tin chung"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "Thư"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "Fax"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP "
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1334,65 +1270,62 @@ msgstr "FTP "
 msgid "Group"
 msgstr "Nhóm "
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "Bộ phận"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "Số điện thoại"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "Ứng dụng"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "Máy chủ (server)"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "Máy khách yếu"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "Máy trạm"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Nhóm đối tượng"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1427,469 +1360,461 @@ msgstr "Cấu hình"
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr "Theme"
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr "Thiết lập mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr "Độ dài tối thiểu của mật khẩu"
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr "Sử dụng việc hết hạn tài khoản"
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr "Hiển thị tóm tắt trên danh sách"
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr "Các đơn vị quản trị chức danh"
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr "Bật chức năng Copy & Paste"
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr "Đăng nhập và phiên"
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr "Thuộc tính đăng nhập"
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr "Thực thi việc mã hóa các kết nối"
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr "Cảnh báo nếu một phiên chưa được mã hóa"
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr "Nhớ thiết lập bộ lọc đối thoại "
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr "Thời gian cho một phiên (một Session)"
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr "Snapshots/Undo"
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr "Bật chức năng snapshots"
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr "Gốc snapshot"
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr "Kho lưu trữ người và nhóm"
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr "Thuộc tính DN người"
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr "Bao gồm chức danh cá nhân trong DN của người dùng"
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr "Các UID tự động"
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr "Sá»­a lá»—i"
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr "Thời gian truy vấn LDAP tối đa"
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr "Đăng nhập thống kê LDAP"
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr "Cấp độ sửa lỗi"
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1918,263 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "Mật khẩu mới cần được cắt ngắn lại."
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
-msgstr ""
-"Mật khẩu bạn vừa đưa vào làm mật khẩu hiện tại không giống mật khẩu thật."
+msgstr "Mật khẩu bạn vừa đưa vào làm mật khẩu hiện tại không giống mật khẩu thật."
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr "Bạn không có quyền thay đổi mật khẩu của bạn."
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr "Thay đổi mật khẩu người dùng"
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "Thông tin chung của người dùng"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "Không rõ"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "Nữ"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "Nam"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr "Không thể tải file lên!"
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr "Phương pháp lập mật khẩu được chọn này không còn ở đây."
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
-msgstr "Phương pháp lập mật khẩu được chọn yêu cầu cấu hình ban đầu!"
-
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "Tên"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "Tên thật"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "Trang chá»§"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "Số fax"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "Điện thoại di động"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "Máy nhắn tin"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "Ngày sinh"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "Đơn vị"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "Mô tả căn nhà"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "Nghề nghiệp"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "Lần cung cấp cuối"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
-msgstr "Địa phương của người dùng"
-
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "Mô tả đơn vị "
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
-msgstr "Lĩnh vực chuyên môn"
-
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "Danh xưng chức năng"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "Hiển thị với tất cả mọi người"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "Phố"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "Vai trò"
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "Mã bưu điện"
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr "Thiết lập chung của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2185,122 +1897,76 @@ msgstr "Thiết lập chung của người dùng"
 msgid "User"
 msgstr "Người dùng"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "Thông tin cá nhân"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
+msgstr "Họ"
+
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
-msgstr "Chứng nhận người dùng"
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "Tên"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "Chức danh cá nhân"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "Chức danh học thuật"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "Ngày sinh"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "Giới tính"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr "Ngôn ngữ muốn sử dụng"
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "Cơ sở"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "Ảnh của người sử dụng"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "Tổ chức"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
-msgstr "Số phòng làm việc"
-
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2312,66 +1978,52 @@ msgstr "Số phòng làm việc"
 msgid "Description"
 msgstr "Mô tả"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
-msgstr "Số nhân viên"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "Loại nhân viên"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
-msgstr "Số phòng"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
-msgstr "Số điện thoại"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
-msgstr "Số máy nhắn tin"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
+msgstr "Ngôn ngữ muốn sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
-msgstr "Số di động"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
-msgstr "Số fax"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "Bang"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2379,306 +2031,439 @@ msgstr "Bang"
 msgid "Location"
 msgstr "Vị trí"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "Địa chỉ theo bưu điện"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "Bang"
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "Đại chỉ nhà theo bưu điện"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "Địa chỉ"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
-msgstr "Số điện thoại nhà"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "Số phòng"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
+msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "Điện thoại di động"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "Máy nhắn tin"
+
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "Số fax"
+
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "Thiết bị cuối "
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "Tổ chức"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "Số phòng ban"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "Hiệu chỉnh các tính năng mail"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
+msgstr "Số phòng làm việc"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "Hiệu chỉnh các tính năng samba"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "Số nhân viên"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "Hiệu chỉnh các tính năng điện thoại"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
+msgstr "Số nhân viên"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "Loại nhân viên"
+
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "Môi trường"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "Hiệu chỉnh các tính năng môi trường"
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "Đại chỉ nhà theo bưu điện"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "Số điện thoại riêng"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr "Số điện thoại nhà"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "Trang chá»§"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "Tên"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "Thư mục chủ"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "Nhóm sơ cấp"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "Trạng thái"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "Bắt buộc có UID/GID "
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "Số ID của người sử dụng"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "Số ID của nhóm"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "Tư cách thành viên nhóm"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "Tài khoản"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "Người dùng phải thay đổi mật khẩu ngay lần đăng nhập đầu tiên"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "Ủy thác hệ thống"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "Chế độ ủy thác"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "Đã vô hiệu"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "Truy cập hoàn toàn"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "Cho phép truy cập đến các máy chủ này"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr "Hiệu chỉnh cài đặt POSIX của người dùng"
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "không được cấu hình"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "tự động"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "Thời gian trước khi tài khoản bị khóa đang hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr "mật khẩu hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Thời gian chờ khóa. Bỏ qua khóa!"
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "Nhóm người dùng"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2797,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2810,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "Các danh mục"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr ""
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "Cơ sở"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "Thiết lập quản trị"
+msgid "Postal address"
+msgstr "Địa chỉ theo bưu điện"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr ""
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "Không thể tìm được một tag chưa được dùng cho đơn vị quản trị này!"
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Tagging '%s'."
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "Tiếp tục"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "Không rõ"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Chuyển từ '%s' đến '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "đối tượng"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Thất bại trong việc copy %s, bãi bỏ thao tác"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "Tiếp tục"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "Các bộ phận"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "Tên bộ phận"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "Địa chỉ"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "Số điện thoại"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Đối tượng '%s' đã bị tag"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Thêm tag (%s) vào đối tượng '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Bỏ tag từ đối tượng '%s'"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr ""
 
@@ -2940,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "Quốc Gia"
 
@@ -2949,8 +2719,8 @@ msgstr "Quốc Gia"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2958,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "Các thao tác"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "Hiệu chỉnh"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2993,11 +2765,24 @@ msgid "List of users"
 msgstr "Danh sách người dùng"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "Mẫu"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "Tên thật"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -3009,7 +2794,7 @@ msgstr "Mẫu"
 msgid "Properties"
 msgstr "Properties"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "Thay đổi mật mã "
@@ -3030,15 +2815,15 @@ msgstr "Áp dụng mẫu"
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -3046,16 +2831,16 @@ msgstr ""
 msgid "Manage users"
 msgstr "Quản lý người dùng"
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
 msgstr "Cho phép"
 
@@ -3063,39 +2848,39 @@ msgstr "Cho phép"
 msgid "You have no permission to change this users password!"
 msgstr "Bạn không được phép thay đổi mật mã người dùng này!"
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "không có"
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3103,53 +2888,52 @@ msgstr ""
 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!"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Nhóm Samba"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "Admin miền"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "Người dùng miền"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "Khách miền"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "Nhóm đặc biệt (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr ""
-"Việc tìm kiếm có quá nhiều kết quả. Không hiển thị nhiều hơn %s mục vào!"
+msgstr "Việc tìm kiếm có quá nhiều kết quả. Không hiển thị nhiều hơn %s mục vào!"
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Không thể tìm thấy một SID nào cho '%s'!"
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Không thể tìm thấy một RIDBASE nào cho '%s'!"
@@ -3163,23 +2947,23 @@ msgstr ""
 msgid "Generic group settings"
 msgstr "Thiết lập nhóm chung"
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr "Loại nhóm Samba"
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr "Tên miền Samba"
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr "Nhóm nhấc điện thoại"
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr "Nhóm phần mềm Nagios"
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr "Thành viên nhóm"
 
@@ -3207,119 +2991,159 @@ msgstr ""
 msgid "Manage groups"
 msgstr ""
 
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "Hiệu chỉnh các tính năng mail"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "Hiệu chỉnh các tính năng samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "Hiệu chỉnh các tính năng điện thoại"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "Môi trường"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "Hiệu chỉnh các tính năng môi trường"
+
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
 #: setup/setup_ldap.tpl.c:41 setup/setup_ldap.tpl.c:44
 msgid "Select user"
 msgstr "Chọn người dùng"
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr "Các vai trò kiểm soát truy cập"
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr "Hiệu chỉnh các vai trò ACL"
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr "Tất cả các mục"
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr "Xác lập lại ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr "Một cấp độ"
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr "Đối tượng hiện tại"
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr "Hoàn thành cây thư mục con"
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr "Hoàn thành cây thư mục con (vĩnh viễn)"
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "Lên"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "Xuống"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "Xóa"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr "Không có cài đặt ACL cho mục này"
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL cho các đối tượng sau: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr "Hiệu chính mục ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr "Xác lập mục ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Hiệu chỉnh ACL cho'%s', vùng là '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr "Tất cả các đối tượng hiện trong  cây thư mục con hiện tại"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr "Đối tượng đang được sử dụng"
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr ""
-"Vai trò này không thể bị xóa bỏ trong khi nó vẫn đang được sử dụng bởi các "
-"đối tượng:"
+msgstr "Vai trò này không thể bị xóa bỏ trong khi nó vẫn đang được sử dụng bởi các đối tượng:"
+
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "Vai trò"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr "Các vai trò kiểm soát truy cập"
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr ""
 
@@ -3327,7 +3151,7 @@ msgstr ""
 msgid "List of acls"
 msgstr "Danh sách các ads"
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
 msgstr ""
@@ -3345,7 +3169,7 @@ msgid "ACL Templates"
 msgstr "Các mẫu ACL"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "Tất cả các nhóm đối tượng"
 
@@ -3365,51 +3189,62 @@ msgstr ""
 msgid "Windows Install"
 msgstr "Cài đặt window"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "Các hàng phone"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "Thiết bị cuối "
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "Các ứng dụng"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "Các thiết bị"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "Khởi động"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "Các hệ thống"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "Tóm tắt FAI"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "Các hàng phone"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "Các ứng dụng"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3425,9 +3260,7 @@ msgstr "Thông tin"
 
 #: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "You cannot combine terminals and workstations in one object group!"
-msgstr ""
-"Bạn không thể kết hợp các thiết bị cuối và máy trạm vào trong một nhóm đối "
-"tượng!"
+msgstr "Bạn không thể kết hợp các thiết bị cuối và máy trạm vào trong một nhóm đối tượng!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:583
 msgid "Non existing dn:"
@@ -3441,7 +3274,7 @@ msgstr "Bạn chỉ có thể kết hợp hai đối tượng khác nhau tại m
 msgid "Object group generic"
 msgstr "Nhóm đối tượng chung"
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr "Thành viên"
 
@@ -3472,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Qúa trình xóa đã bị hủy bỏ bởi plugin '%s': %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "Các tham chiếu"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "Hiệu chỉnh entry này"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "Xóa bỏ entry"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
 msgstr ""
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3545,29 +3374,29 @@ msgstr "Loại"
 msgid "Arguments"
 msgstr "Tranh luận"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr "Tạo ra trang này khiến cho bộ dịch PHP sinh ra một số lỗi!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr "Gửi thông báo lỗi"
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "Thông tin Toggle"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr "Lá»—i ná»™i bá»™"
 
@@ -3577,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "Hiển thị các thay đổi"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, 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."
@@ -3590,103 +3419,135 @@ msgstr "Bạn không được phép tạo ra snapshot cho %s."
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, 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."
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "Nhóm người dùng"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#, fuzzy, php-format
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#, php-format
 msgid "Cannot read uploaded file: %s"
-msgstr "Không thể tải file lên!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "Giấy chứng nhận trống!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr "Tải lại"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "Xuống"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "Tên đối tượng"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3708,7 +3569,7 @@ msgstr "Chọn để liệt kê đối tượng mà cho phép '%s'"
 msgid "Select to search within subtrees"
 msgstr "Chọn để tìm kiếm trong các cây con"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr "Tìm kiếm tại các cây con"
@@ -3846,111 +3707,111 @@ msgstr "Trường '%s' có chứa một từ khóa dự trữ!"
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr "Lệnh được cụ thể hóa là %s móc nối với plugin '%s' không tồn tại!"
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr "Lệnh '%s' không hợp lệ!"
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr "Lệnh '%s' (%s) cho plugin %s không hợp lệ!"
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr "Lệnh '%s' cho plugin '%s' không hợp lệ!"
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr "Lệnh '%s' (%s) không hợp lệ!"
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
-msgstr "Không thể chạy lệnh '%s'!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
+msgstr "Lệnh '%s' (%s) cho plugin %s không hợp lệ!"
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
-msgstr "Không thể chạy lệnh '%s' ('%s) cho plugin %s!"
+msgid "Cannot execute '%s' command!"
+msgstr "Không thể chạy lệnh '%s'!"
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr "Không thể chạy lệnh '%s' cho plugin %s!"
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr "Không thể chạy lệnh '%s' ('%s)!"
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr "Không thể chạy lệnh '%s' ('%s) cho plugin %s!"
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr "Gía trị '%s' quá lớn!"
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr "Gía trị '%s' quá nhỏ!"
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr "'%s' phải lớn hơn %d hoặc trên nữa!"
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr "'%s' phụ thuộc vào '%s'- xin hãy cung cấp cả hai giá trị!"
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr "Đã có sẵn một entry với thuộc tính '%s' trong hệ thống này!"
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr "Trường được yêu cầu '%s' bị rỗng!"
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr "Ví dụ"
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr "Trường '%s' chứa các ký tự không hợp lệ"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr "'%s' không được phép:"
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr "'%s' không được cho phép!"
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr "Trường '%s' chứa các ký tự không hợp lệ!"
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr "PHP mở rộng %s mất tích!"
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3963,11 +3824,10 @@ msgstr "PHP mở rộng %s mất tích!"
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3975,309 +3835,300 @@ msgstr "Hủy bỏ"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "Áp dụng"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "Lưu lại"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr "Thêm %s"
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr "Xóa %s"
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "Đặt"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr "Thiết lập %s"
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr "Hiệu chỉnh..."
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr "Hiệu chỉnh %s..."
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "Quay lại"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr "Tài khoản này không có chức năng mở rộng %s hợp lệ!"
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
-msgstr ""
-"Tài khoản này đã bật các thiết lập %s lên. Bạn có thể tắt chúng đi bằng việc "
-"kích vào bên dưới."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
+msgstr "Tài khoản này đã bật các thiết lập %s lên. Bạn có thể tắt chúng đi bằng việc kích vào bên dưới."
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
-msgstr ""
-"Tài khoản này đã bật các thiết lập %s lên. Để tắt chúng đi, bạn cần phải xóa "
-"thiết lập %s trước!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
+msgstr "Tài khoản này đã bật các thiết lập %s lên. Để tắt chúng đi, bạn cần phải xóa thiết lập %s trước!"
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
-msgstr ""
-"Tài khoản này đã tắt các thiết lập %s đi. Bạn có thể bật chúng lên bằng việc "
-"kích vào bên dưới."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
+msgstr "Tài khoản này đã tắt các thiết lập %s đi. Bạn có thể bật chúng lên bằng việc kích vào bên dưới."
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
-msgstr ""
-"Tài khoản này đã tắt các thiết lập %s đi. Để bật chúng lên, bạn cần phải "
-"thêm thiết lập %s trước!"
+msgstr "Tài khoản này đã tắt các thiết lập %s đi. Để bật chúng lên, bạn cần phải thêm thiết lập %s trước!"
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr "Thêm thiết lập %s "
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr "Xóa thiết lập %s"
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 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 "
+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 "
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "Tháng Một"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "Tháng Hai"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "Tháng Ba"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "Tháng Tư"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "Tháng Năm"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "Tháng Sáu"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "Tháng Bảy"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "Tháng Tám"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "Tháng Chín"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "Tháng Mười"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "Tháng Mười Hai"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr "Đọc thao tác"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr "thêm tao tác"
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr "thay đối thao tác"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr "xóa thao tác"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr "tìm kiếm thao tác"
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr "Xác định thẩm quyền"
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr "LDAP %s thất bại!"
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr "Hoạt động LDAP thất bại!"
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr "Tải lên thất bại!"
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr "Tải lên thất bại: %s"
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại!"
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr "Giao tiếp với dịch vụ cơ sở hạ tầng bị thất bại: %s"
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr "'%s' này vẫn còn được sử dụng bởi đối tượng: %s "
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr "'%s' này vẫn còn được sử dụng."
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr "'%s' vẫn còn được sử dụng bởi các đối tượng này: %s"
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr "File '%s' không tồn tại!"
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr "Không thể mở file '%s' để đọc!"
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr "Không thể mở file '%s' để viết!"
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr "Không thế xóa file '%s'!"
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr "Không thể xóa folder '%s'!"
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr "Kiểm tra hỗ trợ %s"
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr "Cài đặt và kích hoạt mô-đun PHP %s."
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4298,105 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "Áp dụng bộ lọc"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr "Giấy chứng nhận trống!"
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr "Không thể tải giấy chứng nhận - chỉ có PEM/DER là được hỗ trợ!"
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
-msgstr ""
-"Không thể triết xuất thông tin cho những giấy chứng nhận không phải là PEM!"
+msgstr "Không thể triết xuất thông tin cho những giấy chứng nhận không phải là PEM!"
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr "Không tải được giấy chứng nhận có hiệu lực nào!"
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr "Hủy bỏ tất"
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr "Không thể paste"
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "Lỗi XML trong fusiondirectory.conf: %s tại dòng %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống."
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
-msgstr ""
-"Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa "
-"được thiết lập."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
+msgstr "Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa được thiết lập."
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr "Tất cả các mục"
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "Ná»™p"
 
@@ -4409,200 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
-msgstr ""
-"Không thể tìm thấy một phương pháp mật khẩu phù hợp cho hàm băm hiện tại!"
+msgstr "Không thể tìm thấy một phương pháp mật khẩu phù hợp cho hàm băm hiện tại!"
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr "Thay đổi ACL dn"
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "Từ"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr "Xác lập lại ACLs"
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr "Sử dụng ACL được xác định trong vai trò"
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr "Không có thiết lập ACL cho hạng mục này!"
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr "Có chứa ACLs cho các đối tượng: %s "
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr "Hạng mục ACL"
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Hiệu chỉnh ACL cho '%s' - phạm vi là '%s'"
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr "Hiển thị/ Ẩn các thiết lập cao cấp "
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr "Tạo ra đối tượng"
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr "Dịch chuyển đối tượng"
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr "Xóa đối tượng"
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "đọc"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "viết"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr "Hoàn thành đối tượng"
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr "dạng ACL '%s' không được biết đến!"
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr "Entry '%s' không được biết đến!"
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr "Vai trò: %s"
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr "Vai trò không được biết đến"
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr "Chứa các thiết lập cho các đối tượng: %s"
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "Các thành viên"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr "không hoạt động"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr "Quản lý các danh sách kiểm soát truy cập"
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr "Các vai trò ACL"
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr "Chọn tất"
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "Đi đến bộ phận gốc"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "Đi đến bộ phận người dùng"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr "Cut"
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
@@ -4625,73 +4475,65 @@ msgstr "ObjecType được chỉ định đang rỗng hặc không hợp lệ!"
 msgid ""
 "The timezone setting '%s' in your fusiondirectory.conf is not valid. Cannot "
 "calculate correct timezone offset."
-msgstr ""
-"Múi giờ thiết lập '%s' trong fusiondirectory.config không hợp lệ. Không thể "
-"tính toán chính xác thời gian bù thêm vào múi giờ."
+msgstr "Múi giờ thiết lập '%s' trong fusiondirectory.config không hợp lệ. Không thể tính toán chính xác thời gian bù thêm vào múi giờ."
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr "Cảnh báo khả năng hoạt động"
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
-msgstr ""
-"Khả năng hoạt động của LDAP rất thấp: truy vấn lần cuối mất khoảng %.2fs!"
+msgstr "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cuối mất khoảng %.2fs!"
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
-msgstr ""
-"Không thể tự động tạo ra cây con với RDN '%s': không có lớp đối tượng nào "
-"được tìm thấy!"
+msgstr "Không thể tự động tạo ra cây con với RDN '%s': không có lớp đối tượng nào được tìm thấy!"
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr "Không thể tự động tạo ra cây con với RDN '%s': không được hỗ trợ "
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Trong khi chạy trên '%s' sử dụng LDAP server '%s'"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Trong khi chạy trên LDAP server %s"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Đây không phải là một DN hợp lệ: '%s'. Khóa để chặn việc nạp thêm phải được "
-"bắt đầu với 'dn:...' trong dòng %s "
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
+msgstr "Đây không phải là một DN hợp lệ: '%s'. Khóa để chặn việc nạp thêm phải được bắt đầu với 'dn:...' trong dòng %s "
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Lỗi trong khi đang nạp thêm dn:'%s', xin hãy kiểm tra lại LDIF của bạn từ "
-"dòng %s trở đi!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr "Lỗi trong khi đang nạp thêm dn:'%s', xin hãy kiểm tra lại LDIF của bạn từ dòng %s trở đi!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr "Tất cả các đối tượng trong hạng mục này"
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr "Định dạng cấu hình đã thay đổi. Xin hãy chạy lại cài đặt!"
 
@@ -4699,247 +4541,222 @@ msgstr "Định dạng cấu hình đã thay đổi. Xin hãy chạy lại cài
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Bạn chuẩn bị xóa chế độ snapshot '%s'."
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr "Xóa snapshot"
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
-msgstr ""
-"Lỗi nghiêm trọng: không có vị trí lớp nào được xác định - xin hãy chạy '%s' "
-"để sửa lỗi này"
+msgstr "Lỗi nghiêm trọng: không có vị trí lớp nào được xác định - xin hãy chạy '%s' để sửa lỗi này"
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
-msgstr ""
-"Lỗi nghiêm trọng: không thể tạo ra lớp '%s' - hãy thử chạy '%s' để sửa lỗi "
-"này"
+msgstr "Lỗi nghiêm trọng: không thể tạo ra lớp '%s' - hãy thử chạy '%s' để sửa lỗi này"
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
+msgstr "LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Tên người dùng/ UID không phải là duy nhất trong cây LDAP!"
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
-msgstr ""
-"Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc "
-"với Admin của bạn."
+msgstr "Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc với Admin của bạn."
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Lỗi khi đang thêm một khóa vào. Hãy liên lạc với các nhà phát triển!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
-msgstr ""
-"Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với "
-"admin của bạn!"
+msgstr "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với admin của bạn!"
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
-msgstr ""
-"Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra - "
-"hãy dọn sạch các tham chiếu."
+msgstr "Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra - hãy dọn sạch các tham chiếu."
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
-msgstr ""
-"Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
-"vượt quá tiêu chuẩn"
+msgstr "Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn vượt quá tiêu chuẩn"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "chưa hoàn thành"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "các entry cho mỗi trang"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
-msgstr ""
-"Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
+msgstr "Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr "Đã từng lưu trữ thông tin cụ thể về tài khoản."
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
-msgstr ""
-"Đã từng khóa các entry hiện đang được hiệu chỉnh nhằm tránh các thay đổi "
-"khác nhau tại cùng một thời điểm."
+msgstr "Đã từng khóa các entry hiện đang được hiệu chỉnh nhằm tránh các thay đổi khác nhau tại cùng một thời điểm."
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Lớp đối tượng '%s' được yêu cầu mất tích!"
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Lớp đối tượng lựa chọn '%s' mất tích!"
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Phiên bản không phù hợp với lớp đối tượng '%s' được yêu cầu (!=%s)!"
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
-msgstr ""
-"Bạn vừa bật lựa chọn rfc2307bis lên trên bước ' cài đặt ldap', nhưng cấu "
-"hình giản đồ của bạn không hỗ trợ lựa chọn này."
+msgstr "Bạn vừa bật lựa chọn rfc2307bis lên trên bước ' cài đặt ldap', nhưng cấu hình giản đồ của bạn không hỗ trợ lựa chọn này."
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
-msgstr ""
-"Để có thể sử dụng được nhóm conform rfc2307bis, objectClass "
-"'posixGroup' (nhóm posix) phải được hỗ trợ     "
+msgstr "Để có thể sử dụng được nhóm conform rfc2307bis, objectClass 'posixGroup' (nhóm posix) phải được hỗ trợ     "
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
-msgstr ""
-"Lược đồ của bạn được cấu hình để hỗ trợ nhóm rfc2307bis, nhưng bạn đã vừa "
-"tắt chức năng này đi trong bước 'cài đặt ldap'."
+msgstr "Lược đồ của bạn được cấu hình để hỗ trợ nhóm rfc2307bis, nhưng bạn đã vừa tắt chức năng này đi trong bước 'cài đặt ldap'."
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "ObjectClass (Lớp đối tượng) 'posixGroup' phải CÓ CẤU TRÚC"
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Lệnh '%s', được xác định là POSTMODIFY (thay đổi sau) cho chế độ plugin '%s' "
-"hình như không tồn tại."
+msgstr "Lệnh '%s', được xác định là POSTMODIFY (thay đổi sau) cho chế độ plugin '%s' hình như không tồn tại."
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr "Không thể phân phối một ID miễn phí!"
 
@@ -4966,9 +4783,7 @@ msgstr "Màn hình đăng nhập"
 msgid ""
 "Please use your username and your password to log into the site "
 "administration system."
-msgstr ""
-"Xin hãy sử dụng tên và mật khẩu của bạn để đăng nhập vào trang hệ thống quản "
-"trị."
+msgstr "Xin hãy sử dụng tên và mật khẩu của bạn để đăng nhập vào trang hệ thống quản trị."
 
 #: ihtml/themes/default/login.tpl.c:8 ihtml/themes/default/login.tpl.c:11
 #: ihtml/themes/default/login.tpl.c:14 ihtml/themes/default/recovery.tpl.c:38
@@ -5001,7 +4816,6 @@ msgstr "Kích vào đây để đăng nhập"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -5011,6 +4825,7 @@ msgstr "Kích vào đây để đăng nhập"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr ""
 
@@ -5022,22 +4837,15 @@ msgstr "Phát hiện xung đột giữa các phiên"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
-msgstr ""
-"Có lẽ có một chức năng khác nữa trong phiên của bạn đang hoạt động. Việc "
-"chạy nhều cửa sổ cùng lúc về kỹ thuật là không thể và việc này phụ thuộc rất "
-"nhiều vào trình duyệt mà bạn đang dùng.Việc sử dụng các trình duyệt khác "
-"nhau cùng một lúc (ví dụ như IE và Mozilla) là có thể. Nhấn vào nút đăng "
-"xuất để đóng phiên này."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
+msgstr "Có lẽ có một chức năng khác nữa trong phiên của bạn đang hoạt động. Việc chạy nhều cửa sổ cùng lúc về kỹ thuật là không thể và việc này phụ thuộc rất nhiều vào trình duyệt mà bạn đang dùng.Việc sử dụng các trình duyệt khác nhau cùng một lúc (ví dụ như IE và Mozilla) là có thể. Nhấn vào nút đăng xuất để đóng phiên này."
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"Bỏ qua tin nhắn này sẽ thay đổi/hủy dữ liệu mà hiện nay bạn đang hiệu chỉnh, "
-"vì thể xin hãy đóng các cửa sổ lại và đăng nhập lại."
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "Bỏ qua tin nhắn này sẽ thay đổi/hủy dữ liệu mà hiện nay bạn đang hiệu chỉnh, vì thể xin hãy đóng các cửa sổ lại và đăng nhập lại."
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -5069,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -5089,9 +4897,9 @@ msgstr "Mật khẩu mới được lặp lại"
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr "Ưu điểm của mật khẩu"
 
@@ -5157,9 +4965,7 @@ msgstr ""
 msgid ""
 "Don't forget to check references to other objects, for example does the "
 "selected printer still exists ?"
-msgstr ""
-"Đừng quên kiểm tra các tham chiếu với các đối tượng khác, ví dụ như liệu máy "
-"in được chọn có còn tồn tại không?"
+msgstr "Đừng quên kiểm tra các tham chiếu với các đối tượng khác, ví dụ như liệu máy in được chọn có còn tồn tại không?"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:17
 msgid "There is no snapshot available that could be restored"
@@ -5178,19 +4984,13 @@ msgid ""
 "This procedure will create a snapshot of the selected object. It will be "
 "stored inside a special branch of your directory system and can be restored "
 "later on."
-msgstr ""
-"Thủ tục này sẽ tạo ra một snapshot của đối tượng được chọn. Nó sẽ được lưu "
-"trữ trong một nhánh đặc biệt thuộc hệ thống thư mục của bạn và có thể được "
-"phục hồi sau này."
+msgstr "Thủ tục này sẽ tạo ra một snapshot của đối tượng được chọn. Nó sẽ được lưu trữ trong một nhánh đặc biệt thuộc hệ thống thư mục của bạn và có thể được phục hồi sau này."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:32
 msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
-msgstr ""
-"Hãy nhớ rằng các entry vào cơ sở dữ liệu, các cấu hình DNS và các vùng có "
-"thể được tạo ra trong việc mở rộng server sẽ không được lưu lại trong "
-"snapshot."
+msgstr "Hãy nhớ rằng các entry vào cơ sở dữ liệu, các cấu hình DNS và các vùng có thể được tạo ra trong việc mở rộng server sẽ không được lưu lại trong snapshot."
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
@@ -5212,9 +5012,7 @@ msgstr ""
 #: plugins/admin/groups/remove.tpl.c:8 plugins/admin/acl/remove.tpl.c:8
 #: plugins/admin/ogroups/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."
+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."
 
 #: ihtml/themes/default/islocked.tpl.c:2
 msgid "Locking conflict detected"
@@ -5225,10 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"Nếu việc phát hiện khóa này sai, một người nào đó chắc hẳn đã đóng trình "
-"duyệt web trong quá trình thao tác hiệu chỉnh. Bạn có thể muốn tiếp quản "
-"việc khóa bằng các nhấn vào nút 'tiếp tục hiệu chỉnh'."
+msgstr "Nếu việc phát hiện khóa này sai, một người nào đó chắc hẳn đã đóng trình duyệt web trong quá trình thao tác hiệu chỉnh. Bạn có thể muốn tiếp quản việc khóa bằng các nhấn vào nút 'tiếp tục hiệu chỉnh'."
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5236,16 +5031,11 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"Lựa chọn giới hạn kích cỡ khiến cho hoạt động của LDAP nhanh hơn và giúp cho "
-"LDAP server không chịu quá nhiều tải. Cách đơn giản nhất để quản lý được các "
-"cơ sở dữ liệu lớn mà không có thời gian hạn định dài là hạn chế việc tìm "
-"kiếm của bạn vào các giá trị nhỏ hơn và sử dụng bộ lọc để có được các entry "
-"mà bạn đang tìm kiếm."
+msgstr "Lựa chọn giới hạn kích cỡ khiến cho hoạt động của LDAP nhanh hơn và giúp cho LDAP server không chịu quá nhiều tải. Cách đơn giản nhất để quản lý được các cơ sở dữ liệu lớn mà không có thời gian hạn định dài là hạn chế việc tìm kiếm của bạn vào các giá trị nhỏ hơn và sử dụng bộ lọc để có được các entry mà bạn đang tìm kiếm."
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5259,9 +5049,7 @@ msgstr "Lờ đi lỗi này và hiển thị tất cả các entry mà LDAP serv
 msgid ""
 "ignore this error and show all entries that fit into the defined sizelimit "
 "and let me use filters instead"
-msgstr ""
-"Lờ lỗi này đi và hiển thị tất cả các entry mà phù hợp với giới hạn kích cỡ "
-"đã xác định và thay vào đó cho tôi sử dụng các bộ lọc "
+msgstr "Lờ lỗi này đi và hiển thị tất cả các entry mà phù hợp với giới hạn kích cỡ đã xác định và thay vào đó cho tôi sử dụng các bộ lọc "
 
 #: ihtml/themes/default/acl.tpl.c:2 plugins/admin/acl/acl_role.tpl.c:2
 msgid "Assigned ACL for current entry"
@@ -5329,10 +5117,6 @@ msgstr "Đăng nhập:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5347,9 +5131,7 @@ msgstr ""
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
-msgstr ""
-"Xin hãy đóng cửa sổ trình duyệt này lại và dọn sạch bộ nhớ đệm thẩm định "
-"quyền để tránh việc tự động thẩm định lại quyền bằng trình duyệt của bạn."
+msgstr "Xin hãy đóng cửa sổ trình duyệt này lại và dọn sạch bộ nhớ đệm thẩm định quyền để tránh việc tự động thẩm định lại quyền bằng trình duyệt của bạn."
 
 #: ihtml/themes/default/password.tpl.c:2
 msgid "Change your password"
@@ -5357,20 +5139,17 @@ msgstr "Thay đổi mật khẩu của bạn"
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
-msgstr ""
-"Hộp thoại này cung cấp một cách đơn giản để thay đổi mật khẩu của bạn. Hãy "
-"nhập mật khẩu hiện tại và mật khẩu mới vào (hai lần) trong các trường bên "
-"dưới và nhấn vào nút 'Thay đổi'."
+msgstr "Hộp thoại này cung cấp một cách đơn giản để thay đổi mật khẩu của bạn. Hãy nhập mật khẩu hiện tại và mật khẩu mới vào (hai lần) trong các trường bên dưới và nhấn vào nút 'Thay đổi'."
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "Mật khẩu hiện tại"
 
@@ -5387,8 +5166,7 @@ msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:8
 msgid "Remember that some properties like taken snapshots will not be copied!"
-msgstr ""
-"Hãy nhớ rằng một số đặc tính ví dụ như snapshot sẽ không được copy lại!"
+msgstr "Hãy nhớ rằng một số đặc tính ví dụ như snapshot sẽ không được copy lại!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl.c:11
 msgid ""
@@ -5538,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5577,9 +5355,7 @@ msgstr "Chuyển nhóm thành cây nhóm đã được cấu hình"
 msgid ""
 "This dialog allows moving a couple of groups to the configured group tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Hộp thoại này cho phép việc chuyển một vài nhóm đến cây nhóm đã được cấu "
-"hình. Thực hiện việc này có thể sẽ làm gọn gàng dịch vụ LDAP của bạn."
+msgstr "Hộp thoại này cho phép việc chuyển một vài nhóm đến cây nhóm đã được cấu hình. Thực hiện việc này có thể sẽ làm gọn gàng dịch vụ LDAP của bạn."
 
 #: setup/setup_migrate.tpl.c:29
 msgid ""
@@ -5614,9 +5390,7 @@ msgstr "Chuyển người dùng sang cây người dùng được cấu hình"
 msgid ""
 "This dialog allows moving a couple of users to the configured user tree. "
 "Doing this may straighten your LDAP service."
-msgstr ""
-"Hộp thoại này cho phép việc chuyển một vài nhóm đến cây nhóm đã được cấu "
-"hình. Thực hiện việc này có thể sẽ làm gọn gàng dịch vụ LDAP của bạn."
+msgstr "Hộp thoại này cho phép việc chuyển một vài nhóm đến cây nhóm đã được cấu hình. Thực hiện việc này có thể sẽ làm gọn gàng dịch vụ LDAP của bạn."
 
 #: setup/setup_migrate.tpl.c:56
 msgid ""
@@ -5674,9 +5448,7 @@ msgstr ""
 msgid ""
 "If you want to know what will be done when migrating the selected entries, "
 "use the 'Show changes' button to see the LDIF."
-msgstr ""
-"Nếu bạn muốn biết việc gì sẽ được tiến hành khi di trú các entry được chọn "
-"này, hãy sử dụng phím 'hiển thị thay đổi 'để xem định dạng LDIF."
+msgstr "Nếu bạn muốn biết việc gì sẽ được tiến hành khi di trú các entry được chọn này, hãy sử dụng phím 'hiển thị thay đổi 'để xem định dạng LDIF."
 
 #: setup/setup_migrate.tpl.c:161
 msgid ""
@@ -5687,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr ""
 
@@ -5709,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5731,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5792,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5806,12 +5579,9 @@ msgstr "Xin hãy lựa chọn ngôn ngữ ưu thích"
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
-msgstr ""
-"Tại thời điểm này, bạn có thể lựa chọn trang này với ngôn ngữ mặc định. Nếu "
-"chọn 'tự động', bạn sẽ sử dụng ngôn ngữ được yêu cẩu bởi trình duyệt này. "
-"Việc thiết lập này có  bị ghi đè với mỗi một người dùng."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
+msgstr "Tại thời điểm này, bạn có thể lựa chọn trang này với ngôn ngữ mặc định. Nếu chọn 'tự động', bạn sẽ sử dụng ngôn ngữ được yêu cẩu bởi trình duyệt này. Việc thiết lập này có  bị ghi đè với mỗi một người dùng."
 
 #: setup/setup_language.tpl.c:8
 msgid "Please select your preferred language here"
@@ -5825,27 +5595,27 @@ msgstr "Xin hãy lựa chọn múi giờ bạn muốn ở đây"
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr "Bật chức năng khóa việc hiệu chỉnh lên"
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr "Tắt chức năng đăng ký _toàn cầu "
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr "Hiển thị lỗi PHP"
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr "Vô hiệu hóa/ Tắt chức năng"
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr "Bật chức năng"
 
@@ -5882,8 +5652,7 @@ msgstr "Cố gắng tìm ra vấn đề trong cài đặt PHP và LDAP của b
 
 #: setup/setup_welcome.tpl.c:14
 msgid "Let you choose from a set of basic and advanced configuration switches"
-msgstr ""
-"Cho phép bạn lựa chọn từ một loạt các phím chuyển cấu hình cơ bản và cao cấp"
+msgstr "Cho phép bạn lựa chọn từ một loạt các phím chuyển cấu hình cơ bản và cao cấp"
 
 #: setup/setup_welcome.tpl.c:17
 msgid "Guided migration of existing LDAP trees"
@@ -5959,11 +5728,9 @@ msgstr "Kiểm tra lược đồ thất bại"
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
-msgstr ""
-"Không thể đọc một thông tin lược đồ nào, bỏ qua toàn bộ việc kiểm tra. Điều "
-"chỉnh các acls ldap của bạn."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
+msgstr "Không thể đọc một thông tin lược đồ nào, bỏ qua toàn bộ việc kiểm tra. Điều chỉnh các acls ldap của bạn."
 
 #: setup/setup_schema.tpl.c:20
 msgid ""
@@ -6012,9 +5779,7 @@ msgstr "Đối tượng này không có mối quan hệ nào với các đối t
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
-msgstr ""
-"Bạn đã thay đổi mật khẩu thành công. Hãy nhớ thay đổi cả các chương trình "
-"cấu hình để sử dụng được nó."
+msgstr "Bạn đã thay đổi mật khẩu thành công. Hãy nhớ thay đổi cả các chương trình cấu hình để sử dụng được nó."
 
 #: plugins/personal/password/nochange.tpl.c:2
 #: plugins/personal/generic/nochange.tpl.c:2
@@ -6027,10 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"Để thay đổi được mật khẩu cá nhân, sử dụng các trường dưới đây. Các thay đổi "
-"sẽ diễn ra ngay lập tức. Xin hãy nhớ mật khẩu mới, bởi vì bạn sẽ không thể "
-"đăng nhập vào nếu không có nó."
+msgstr "Để thay đổi được mật khẩu cá nhân, sử dụng các trường dưới đây. Các thay đổi sẽ diễn ra ngay lập tức. Xin hãy nhớ mật khẩu mới, bởi vì bạn sẽ không thể đăng nhập vào nếu không có nó."
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -6038,47 +5800,40 @@ msgstr ""
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
-msgstr ""
-"Thay đổi mật khẩu có thể ảnh hưởng đến sự xác nhận của bạn lên các dịch vụ "
-"mail, ủy quyền (proxy), samba và unix."
+msgstr "Thay đổi mật khẩu có thể ảnh hưởng đến sự xác nhận của bạn lên các dịch vụ mail, ủy quyền (proxy), samba và unix."
 
 #: plugins/personal/password/password.tpl.c:8
 msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "Lặp lại mật khẩu mới"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "Đặt mật khẩu"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "Dọn sạch các trường "
 
@@ -6086,55 +5841,10 @@ msgstr "Dọn sạch các trường "
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "Các giấy phép"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "Giấy phép chuẩn"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "Giấy phép S/MIME"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "Giấy phép PKCS12"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "Số seri chứng nhận"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "Ảnh cá nhân"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "Xóa ảnh "
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "Thiết lập của người dùng"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "Họ"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "Tên"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "Bỏ mật khẩu"
@@ -6143,59 +5853,17 @@ msgstr "Bỏ mật khẩu"
 msgid "Set new password"
 msgstr "Đặt mật khẩu mới"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "Thông tin cá nhân"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "Thay đổi hình ảnh"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "Tên Mẫu"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "Ngôn ngữ muốn dùng"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "Số điện thoại riêng"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "Kho lưu mật khẩu"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "Thông tin về tổ chức"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "Số phòng ban"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "Số nhân viên"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "Ảnh cá nhân"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "Số phòng"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "Ảnh của người sử dụng"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "Xin hãy sử dụng Phone Tab"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "Xóa ảnh "
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6212,23 +5880,6 @@ msgstr ""
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr ""
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6247,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr "Văn bản mô tả cho bộ phận"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "Đặt bộ phận như một đơn vị quản trị độc lập"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "Xử lý thao tác được yêu cầu"
@@ -6264,9 +5906,7 @@ msgstr "Xử lý thao tác được yêu cầu"
 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."
+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."
 
 #: plugins/admin/departments/country.tpl.c:8
 msgid "Name of country to create"
@@ -6280,9 +5920,7 @@ msgstr "Bạn hiện đang bỏ/đổi tên bộ phận này."
 msgid ""
 "Modifying a departments naming attribute 'ou' or base may corrupt acls and "
 "snapshot entries for all entire objects."
-msgstr ""
-"Thay đổi thuộc tính đặt tên 'ou' của các bộ phận hoặc cơ sở có thể ảnh hưởng "
-"đển các file acl và các entry snapshot cho toàn bộ các đối tượng."
+msgstr "Thay đổi thuộc tính đặt tên 'ou' của các bộ phận hoặc cơ sở có thể ảnh hưởng đển các file acl và các entry snapshot cho toàn bộ các đối tượng."
 
 #: plugins/admin/departments/dep_move_confirm.tpl.c:11
 msgid "FusionDirectory can NOT fix this for you, yet."
@@ -6292,9 +5930,7 @@ msgstr ""
 msgid ""
 "Before you confirm this action, ensure that everything will be as expected, "
 "possibly the best solution is a backup."
-msgstr ""
-"Trước khi bạn xác nhận hành động này, hãy đảm bảo rằng mọi thứ sẽ như mong "
-"đợi, có lẽ cách giải quyết tốt nhất là có một bản backup."
+msgstr "Trước khi bạn xác nhận hành động này, hãy đảm bảo rằng mọi thứ sẽ như mong đợi, có lẽ cách giải quyết tốt nhất là có một bản backup."
 
 #: plugins/admin/departments/organization.tpl.c:5
 msgid "Name of organization"
@@ -6346,10 +5982,7 @@ 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ỏ."
+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ỏ."
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6379,9 +6012,7 @@ msgstr "Áp dụng một mẫu"
 msgid ""
 "Applying a template to several users will replace all user attributes "
 "defined in the template."
-msgstr ""
-"Việc áp dụng một mẫu cho vài người dùng sẽ thay thế tất cả các thuộc tính "
-"của người dùng được xác định trên mẫu."
+msgstr "Việc áp dụng một mẫu cho vài người dùng sẽ thay thế tất cả các thuộc tính của người dùng được xác định trên mẫu."
 
 #: plugins/admin/users/templatize.tpl.c:11
 msgid "No templates available!"
@@ -6396,10 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"Dùng các mẫu có thể hỗ trợ việc tạo ra một người sử dụng mới. Nhiều ghi chép "
-"cơ sở dữ liệu có thể tự động tiến hành. Chọn 'none' để bỏ qua việc sử dụng "
-"các mẫu."
+msgstr "Dùng các mẫu có thể hỗ trợ việc tạo ra một người sử dụng mới. Nhiều ghi chép cơ sở dữ liệu có thể tự động tiến hành. Chọn 'none' để bỏ qua việc sử dụng các mẫu."
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6423,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6433,20 +6061,13 @@ msgid ""
 "To change the user password use the fields below. The changes take effect "
 "immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
-msgstr ""
-"Để thay đổi mật khẩu người dùng sử dụng các trường dưới đây. Việc thay đổi "
-"sẽ có hiệu lực ngay lập tức. Hãy nhớ mật mã mới bởi người dùng sẽ không thể "
-"đăng nhập nếu thiếu nó."
+msgstr "Để thay đổi mật khẩu người dùng sử dụng các trường dưới đây. Việc thay đổi sẽ có hiệu lực ngay lập tức. Hãy nhớ mật mã mới bởi người dùng sẽ không thể đăng nhập nếu thiếu nó."
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr "Cường độ"
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6479,9 +6100,7 @@ msgstr "Tên Posix của nhóm"
 #: plugins/admin/groups/paste_generic.tpl.c:11
 #: plugins/admin/groups/generic.tpl.c:17
 msgid "Normally IDs are autogenerated, select to specify manually"
-msgstr ""
-"Thường thì các ID sẽ được tự động sinh ra, hãy lựa chọn để xác định thủ "
-"công  "
+msgstr "Thường thì các ID sẽ được tự động sinh ra, hãy lựa chọn để xác định thủ công  "
 
 #: plugins/admin/groups/paste_generic.tpl.c:14
 #: plugins/admin/groups/generic.tpl.c:20
@@ -6596,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6660,11 +6284,14 @@ msgstr "Tên của nhóm"
 msgid "Member objects"
 msgstr "Các đối tượng thành viên"
 
-#~ msgid "Multiple edit"
-#~ msgstr "Hiệu chỉnh đa dạng"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr ""
 
-#~ msgid "In all groups"
-#~ msgstr "Trong tất cả các nhóm"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr ""
 
-#~ msgid "Not in all groups"
-#~ msgstr "Không ở trong tất cả các nhóm"
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr ""
diff --git a/locale/zh/fusiondirectory.po b/locale/zh.po
similarity index 70%
rename from locale/zh/fusiondirectory.po
rename to locale/zh.po
index 91a2ce34dd11b622de2b16fadc579f533b844120..cd51b39211e8f70b0c78953a91401fac823a0bdc 100644
--- a/locale/zh/fusiondirectory.po
+++ b/locale/zh.po
@@ -1,55 +1,53 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # 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\n"
+"Project-Id-Version: FusionDirectory-develop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 13:13+0200\n"
-"PO-Revision-Date: 2013-04-14 18:18+0000\n"
-"Last-Translator: fusiondirectory <contact@fusiondirectory.org>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory/"
-"language/zh/)\n"
-"Language: zh\n"
+"POT-Creation-Date: 2013-07-29 20:22+0200\n"
+"PO-Revision-Date: 2013-07-30 11:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (http://www.transifex.com/projects/p/FusionDirectory/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"
 
-#: setup/class_setupStep_Config3.inc:74 setup/class_setupStep_Config3.inc:75
+#: setup/class_setupStep_Config3.inc:73 setup/class_setupStep_Config3.inc:74
 msgid "FusionDirectory settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config3.inc:75
 msgid "Tweak some FusionDirectory core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:32
 #: setup/setup_feedback.tpl.c:44
 msgid "No"
 msgstr "否"
 
-#: setup/class_setupStep_Config3.inc:86 setup/class_setupStep_Schema.inc:87
+#: setup/class_setupStep_Config3.inc:84 setup/class_setupStep_Schema.inc:87
 #: setup/class_setupStep_Config2.inc:76 setup/class_setupStep_Ldap.inc:77
 #: setup/class_setupStep_Config1.inc:91 setup/setup_feedback.tpl.c:29
 #: setup/setup_feedback.tpl.c:41
 msgid "Yes"
 msgstr "是"
 
-#: setup/class_setupStep_Config3.inc:160 setup/class_setup.inc:75
+#: setup/class_setupStep_Config3.inc:158 setup/class_setup.inc:76
 msgid "Setup error"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:281
+#: setup/class_setupStep_Config3.inc:278
 msgid "Session lifetime must be a numeric value!"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:285
+#: setup/class_setupStep_Config3.inc:282
 msgid "Maximum LDAP query time must be a numeric value!"
 msgstr ""
 
@@ -70,105 +68,104 @@ msgid "This step allows you to select your preferred language."
 msgstr ""
 
 #: setup/class_setupStep_Language.inc:50
-#: plugins/config/class_configInLdap.inc:408
+#: plugins/config/class_configInLdap.inc:404
 msgid "Automatic"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:122 setup/class_setupStep_Migrate.inc:123
+#: setup/class_setupStep_Migrate.inc:121 setup/class_setupStep_Migrate.inc:122
 msgid "LDAP inspection"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:124
+#: setup/class_setupStep_Migrate.inc:123
 msgid "Analyze your current LDAP for FusionDirectory compatibility"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:130
+#: setup/class_setupStep_Migrate.inc:129
 msgid "Checking for root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:136
+#: setup/class_setupStep_Migrate.inc:135
 msgid "Inspecting object classes in root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:142
+#: setup/class_setupStep_Migrate.inc:141
 msgid "Checking permission for LDAP database"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:148
+#: setup/class_setupStep_Migrate.inc:147
 msgid "Checking for invisible departments"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:153
+#: setup/class_setupStep_Migrate.inc:152
 msgid "Checking for invisible users"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:160
-#: setup/class_setupStep_Migrate.inc:2989
+#: setup/class_setupStep_Migrate.inc:159
+#: setup/class_setupStep_Migrate.inc:2940
 msgid "Checking for super administrator"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:166
+#: setup/class_setupStep_Migrate.inc:165
 msgid "Checking for users outside the people tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:172
+#: setup/class_setupStep_Migrate.inc:171
 msgid "Checking for groups outside the groups tree"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:179
+#: setup/class_setupStep_Migrate.inc:178
 msgid "Checking for duplicated UID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:185
+#: setup/class_setupStep_Migrate.inc:184
 msgid "Checking for duplicate GID numbers"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:191
+#: setup/class_setupStep_Migrate.inc:190
 msgid "Checking for old style USB devices"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:197
+#: setup/class_setupStep_Migrate.inc:196
 msgid "Checking for old services that have to be migrated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:203
+#: setup/class_setupStep_Migrate.inc:202
 msgid "Checking for old style application menus"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
-#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
-#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:581
-#: setup/class_setupStep_Migrate.inc:722 setup/class_setupStep_Migrate.inc:818
-#: setup/class_setupStep_Migrate.inc:1861
-#: setup/class_setupStep_Migrate.inc:2281
-#: setup/class_setupStep_Migrate.inc:2472
-#: setup/class_setupStep_Migrate.inc:2612
+#: setup/class_setupStep_Migrate.inc:228 setup/class_setupStep_Migrate.inc:280
+#: setup/class_setupStep_Migrate.inc:347 setup/class_setupStep_Migrate.inc:418
+#: setup/class_setupStep_Migrate.inc:496 setup/class_setupStep_Migrate.inc:580
+#: setup/class_setupStep_Migrate.inc:720 setup/class_setupStep_Migrate.inc:816
+#: setup/class_setupStep_Migrate.inc:1847
+#: setup/class_setupStep_Migrate.inc:2270
+#: setup/class_setupStep_Migrate.inc:2457
+#: setup/class_setupStep_Migrate.inc:2597
 msgid "LDAP query failed"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:230 setup/class_setupStep_Migrate.inc:282
-#: setup/class_setupStep_Migrate.inc:349 setup/class_setupStep_Migrate.inc:420
-#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:582
-#: setup/class_setupStep_Migrate.inc:723 setup/class_setupStep_Migrate.inc:819
-#: setup/class_setupStep_Migrate.inc:1862
-#: setup/class_setupStep_Migrate.inc:2282
-#: setup/class_setupStep_Migrate.inc:2473
-#: setup/class_setupStep_Migrate.inc:2613
+#: setup/class_setupStep_Migrate.inc:229 setup/class_setupStep_Migrate.inc:281
+#: setup/class_setupStep_Migrate.inc:348 setup/class_setupStep_Migrate.inc:419
+#: setup/class_setupStep_Migrate.inc:497 setup/class_setupStep_Migrate.inc:581
+#: setup/class_setupStep_Migrate.inc:721 setup/class_setupStep_Migrate.inc:817
+#: setup/class_setupStep_Migrate.inc:1848
+#: setup/class_setupStep_Migrate.inc:2271
+#: setup/class_setupStep_Migrate.inc:2458
+#: setup/class_setupStep_Migrate.inc:2598
 msgid "Possibly the 'root object' is missing."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:250 setup/class_setupStep_Migrate.inc:302
-#: setup/class_setupStep_Migrate.inc:373 setup/class_setupStep_Migrate.inc:450
-#: setup/class_setupStep_Migrate.inc:589 setup/class_setupStep_Migrate.inc:730
-#: setup/class_setupStep_Migrate.inc:2348
-#: setup/class_setupStep_Migrate.inc:2504
-#: setup/class_setupStep_Migrate.inc:2836 html/class_passwordRecovery.inc:432
-#: html/index.php:58 html/index.php:64 html/index.php:403
-#: plugins/personal/posix/class_posixAccount.inc:430
-#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:279
-#: include/class_xml.inc:54 include/functions.inc:912
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707 ihtml/themes/default/conflict.tpl.c:5
+#: setup/class_setupStep_Migrate.inc:249 setup/class_setupStep_Migrate.inc:301
+#: setup/class_setupStep_Migrate.inc:372 setup/class_setupStep_Migrate.inc:449
+#: setup/class_setupStep_Migrate.inc:588 setup/class_setupStep_Migrate.inc:728
+#: setup/class_setupStep_Migrate.inc:2333
+#: setup/class_setupStep_Migrate.inc:2489
+#: setup/class_setupStep_Migrate.inc:2788 html/class_passwordRecovery.inc:433
+#: html/index.php:59 html/index.php:65 html/index.php:404
+#: plugins/personal/posix/class_posixAccount.inc:417
+#: plugins/admin/groups/class_group.inc:965 include/class_tabs.inc:291
+#: include/class_xml.inc:55 include/functions.inc:892
+#: include/functions.inc:2670 ihtml/themes/default/conflict.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:5
 #: ihtml/themes/default/msg_dialog.tpl.c:23
 #: ihtml/themes/default/simple-remove.tpl.c:2
@@ -181,57 +178,56 @@ msgstr ""
 msgid "Warning"
 msgstr "警告"
 
-#: setup/class_setupStep_Migrate.inc:252
+#: setup/class_setupStep_Migrate.inc:251
 #, php-format
 msgid "Found %s duplicate values for attribute 'uidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:256 setup/class_setupStep_Migrate.inc:308
-#: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:457
-#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:585
-#: setup/class_setupStep_Migrate.inc:726 setup/class_setupStep_Migrate.inc:972
-#: setup/class_setupStep_Migrate.inc:1836
-#: setup/class_setupStep_Migrate.inc:1980
-#: setup/class_setupStep_Migrate.inc:2354
-#: setup/class_setupStep_Migrate.inc:2511
-#: setup/class_setupStep_Migrate.inc:2841 include/class_msgPool.inc:469
+#: setup/class_setupStep_Migrate.inc:255 setup/class_setupStep_Migrate.inc:307
+#: setup/class_setupStep_Migrate.inc:379 setup/class_setupStep_Migrate.inc:456
+#: setup/class_setupStep_Migrate.inc:531 setup/class_setupStep_Migrate.inc:584
+#: setup/class_setupStep_Migrate.inc:724 setup/class_setupStep_Migrate.inc:969
+#: setup/class_setupStep_Migrate.inc:1822
+#: setup/class_setupStep_Migrate.inc:1969
+#: setup/class_setupStep_Migrate.inc:2339
+#: setup/class_setupStep_Migrate.inc:2496
+#: setup/class_setupStep_Migrate.inc:2793 include/class_msgPool.inc:477
 #: ihtml/themes/default/msg_dialog.tpl.c:11
 #: ihtml/themes/default/msg_dialog.tpl.c:14
 #: ihtml/themes/default/msg_dialog.tpl.c:29
 #: ihtml/themes/default/msg_dialog.tpl.c:32
 #: ihtml/themes/default/msg_dialog.tpl.c:38 setup/setup_checks.tpl.c:5
 #: setup/setup_checks.tpl.c:26
-#, php-format
 msgid "Ok"
 msgstr "好"
 
-#: setup/class_setupStep_Migrate.inc:304
+#: setup/class_setupStep_Migrate.inc:303
 #, php-format
 msgid "Found %s duplicate values for attribute 'gidNumber'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:375
+#: setup/class_setupStep_Migrate.inc:374
 #, php-format
 msgid "Found %s groups outside the configured tree '%s'."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:376 setup/class_setupStep_Migrate.inc:453
+#: setup/class_setupStep_Migrate.inc:375 setup/class_setupStep_Migrate.inc:452
 msgid "Move"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:452
+#: setup/class_setupStep_Migrate.inc:451
 #, php-format
 msgid "Found %s user(s) outside the configured tree '%s'."
 msgstr ""
 
 #: setup/class_setupStep_Migrate.inc:510 setup/class_setupStep_Migrate.inc:523
-#: setup/class_setupStep_Migrate.inc:958 setup/class_setupStep_Migrate.inc:976
-#: setup/class_setupStep_Migrate.inc:1813
-#: setup/class_setupStep_Migrate.inc:1826
-#: setup/class_setupStep_Migrate.inc:1881
-#: setup/class_setupStep_Migrate.inc:1902
-#: setup/class_setupStep_Migrate.inc:1954
-#: setup/class_setupStep_Migrate.inc:2991
+#: setup/class_setupStep_Migrate.inc:955 setup/class_setupStep_Migrate.inc:973
+#: setup/class_setupStep_Migrate.inc:1799
+#: setup/class_setupStep_Migrate.inc:1812
+#: setup/class_setupStep_Migrate.inc:1867
+#: setup/class_setupStep_Migrate.inc:1888
+#: setup/class_setupStep_Migrate.inc:1943
+#: setup/class_setupStep_Migrate.inc:2942
 msgid "Failed"
 msgstr "失败"
 
@@ -241,48 +237,49 @@ msgid ""
 "The specified user '%s' does not have full access to your ldap database."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:590
+#: setup/class_setupStep_Migrate.inc:589
 #, php-format
 msgid ""
 "Found %s user(s) that will not be visible in FusionDirectory or which are "
 "incomplete."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:592 setup/class_setupStep_Migrate.inc:732
-#: setup/class_setupStep_Migrate.inc:961
-#: setup/class_setupStep_Migrate.inc:1956
-#: setup/class_setupStep_Migrate.inc:2351
-#: setup/class_setupStep_Migrate.inc:2508
-#: setup/class_setupStep_Migrate.inc:2838 setup/setup_migrate.tpl.c:17
+#: setup/class_setupStep_Migrate.inc:591 setup/class_setupStep_Migrate.inc:730
+#: setup/class_setupStep_Migrate.inc:958
+#: setup/class_setupStep_Migrate.inc:1945
+#: setup/class_setupStep_Migrate.inc:2336
+#: setup/class_setupStep_Migrate.inc:2493
+#: setup/class_setupStep_Migrate.inc:2790 setup/setup_migrate.tpl.c:17
 msgid "Migrate"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
+#: setup/class_setupStep_Migrate.inc:1043
 msgid "Migration error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:640 setup/class_setupStep_Migrate.inc:783
+#: setup/class_setupStep_Migrate.inc:639 setup/class_setupStep_Migrate.inc:781
 #, php-format
 msgid "Cannot migrate department '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:731
+#: setup/class_setupStep_Migrate.inc:729
 #, php-format
 msgid "Found %s department(s) that will not be visible in FusionDirectory."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:955
+#: setup/class_setupStep_Migrate.inc:952
 #, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:960
+#: setup/class_setupStep_Migrate.inc:957
 msgid ""
-"There is no valid FusionDirectory 1.0 administrator account inside your LDAP."
+"There is no valid FusionDirectory 1.0 administrator account inside your "
+"LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:962 setup/class_setupStep_Migrate.inc:978
+#: setup/class_setupStep_Migrate.inc:959 setup/class_setupStep_Migrate.inc:975
 #: plugins/admin/departments/dep-list.xml:98
 #: plugins/admin/users/user-list.xml:89 plugins/admin/groups/group-list.xml:90
 #: plugins/admin/acl/acl-list.xml:76 plugins/admin/ogroups/ogroup-list.xml:73
@@ -290,231 +287,217 @@ msgstr ""
 msgid "Create"
 msgstr "创建"
 
-#: setup/class_setupStep_Migrate.inc:966
-#: plugins/personal/generic/class_user.inc:1372
-#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:963
+#: plugins/personal/generic/class_user.inc:145
+#: plugins/admin/users/class_userManagement.inc:52 include/class_acl.inc:203
 msgid "Users"
 msgstr "用户"
 
-#: setup/class_setupStep_Migrate.inc:969
-#: plugins/admin/groups/class_group.inc:1109
-#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:239
+#: setup/class_setupStep_Migrate.inc:966
+#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_groupManagement.inc:36 include/class_acl.inc:203
 msgid "Groups"
 msgstr "用户组"
 
-#: setup/class_setupStep_Migrate.inc:977
+#: setup/class_setupStep_Migrate.inc:974
 msgid "There is no FusionDirectory administrator account inside your LDAP."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1046
+#: setup/class_setupStep_Migrate.inc:1043
 #, php-format
 msgid "Cannot add ACL for user '%s':"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1081
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Input error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1084
+#: setup/class_setupStep_Migrate.inc:1081
 msgid "Uid"
-msgstr ""
+msgstr "UID"
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Password error"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1089
+#: setup/class_setupStep_Migrate.inc:1086
 msgid "Provided passwords do not match!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1094
+#: setup/class_setupStep_Migrate.inc:1091
 msgid "Specify a valid user ID!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1127 html/index.php:216
-#: html/index.php:220 plugins/personal/generic/class_user.inc:307
-#: plugins/personal/generic/class_user.inc:443
-#: plugins/personal/generic/class_user.inc:680
-#: plugins/personal/generic/class_user.inc:886
-#: plugins/personal/generic/class_user.inc:1005
-#: plugins/personal/generic/class_user.inc:1012
-#: plugins/personal/generic/class_user.inc:1030
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/groups/class_group.inc:521
-#: plugins/admin/groups/class_group.inc:527
-#: plugins/admin/groups/class_group.inc:724
-#: plugins/admin/groups/class_group.inc:865
-#: plugins/admin/groups/class_group.inc:870
-#: plugins/admin/acl/class_aclRole.inc:681
+#: setup/class_setupStep_Migrate.inc:1125 html/index.php:217
+#: html/index.php:221 plugins/admin/departments/class_department.inc:281
+#: plugins/admin/groups/class_group.inc:523
+#: plugins/admin/groups/class_group.inc:529
+#: plugins/admin/groups/class_group.inc:726
+#: plugins/admin/groups/class_group.inc:867
+#: plugins/admin/groups/class_group.inc:872
+#: plugins/admin/acl/class_aclRole.inc:625
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #: plugins/admin/ogroups/class_ogroup.inc:449 include/class_tabs.inc:74
-#: include/class_xml.inc:57 include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
-#: include/simpleplugin/class_attribute.inc:1286 include/class_msgPool.inc:215
+#: include/class_xml.inc:58 include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
+#: include/simpleplugin/class_attribute.inc:1336
+#: include/simpleplugin/class_attribute.inc:1438 include/class_msgPool.inc:215
 #: include/class_msgPool.inc:235 include/class_msgPool.inc:265
-#: include/class_msgPool.inc:680 include/class_msgPool.inc:711
-#: include/class_msgPool.inc:738 include/class_management.inc:507
-#: include/class_management.inc:657 include/class_CopyPasteHandler.inc:264
-#: include/class_config.inc:483
+#: include/class_msgPool.inc:688 include/class_msgPool.inc:719
+#: include/class_msgPool.inc:746 include/class_management.inc:513
+#: include/class_management.inc:653 include/class_CopyPasteHandler.inc:266
+#: include/class_config.inc:488
 #: include/password-methods/class_password-methods-sasl.inc:51
 #: include/password-methods/class_password-methods-sasl.inc:63
-#: include/password-methods/class_password-methods.inc:342
-#: include/password-methods/class_password-methods.inc:447
-#: include/password-methods/class_password-methods.inc:458
-#: include/class_plugin.inc:1367 include/class_listing.inc:521
+#: include/password-methods/class_password-methods.inc:320
+#: include/password-methods/class_password-methods.inc:422
+#: include/password-methods/class_password-methods.inc:432
+#: include/class_plugin.inc:1410 include/class_listing.inc:520
 #: include/class_msg_dialog.inc:128 include/class_databaseManagement.inc:78
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3518 include/functions.inc:3526
-#: include/functions.inc:3538 include/functions.inc:3542
-#: include/functions.inc:3557 include/functions.inc:3566
-#: include/functions.inc:3634 ihtml/themes/default/msg_dialog.tpl.c:2
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3451 include/functions.inc:3459
+#: include/functions.inc:3471 include/functions.inc:3475
+#: include/functions.inc:3482 include/functions.inc:3491
+#: include/functions.inc:3559 ihtml/themes/default/msg_dialog.tpl.c:2
 #: ihtml/themes/default/msg_dialog.tpl.c:20 setup/setup_checks.tpl.c:8
 #: setup/setup_checks.tpl.c:29
 msgid "Error"
 msgstr "错误"
 
-#: setup/class_setupStep_Migrate.inc:1127
+#: setup/class_setupStep_Migrate.inc:1125
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1138
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
-#: setup/class_setupStep_Migrate.inc:1966
-#: setup/class_setupStep_Migrate.inc:2215
-#: setup/class_setupStep_Migrate.inc:2219
-#: setup/class_setupStep_Migrate.inc:2409
-#: setup/class_setupStep_Migrate.inc:2429
-#: setup/class_setupStep_Migrate.inc:2549
-#: setup/class_setupStep_Migrate.inc:2896
-#: setup/class_setupStep_Migrate.inc:2910 html/class_passwordRecovery.inc:538
-#: html/index.php:257 html/index.php:269 html/index.php:282
-#: plugins/personal/generic/class_user.inc:592
-#: plugins/personal/generic/class_user.inc:956
-#: plugins/admin/departments/class_department.inc:279
-#: plugins/admin/departments/class_department.inc:474
-#: plugins/admin/departments/class_department.inc:746
-#: plugins/admin/departments/class_department.inc:777
-#: plugins/admin/groups/class_group.inc:668
+#: setup/class_setupStep_Migrate.inc:1136
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
+#: setup/class_setupStep_Migrate.inc:1955
+#: setup/class_setupStep_Migrate.inc:2204
+#: setup/class_setupStep_Migrate.inc:2208
+#: setup/class_setupStep_Migrate.inc:2394
+#: setup/class_setupStep_Migrate.inc:2414
+#: setup/class_setupStep_Migrate.inc:2534
+#: setup/class_setupStep_Migrate.inc:2847
+#: setup/class_setupStep_Migrate.inc:2861 html/class_passwordRecovery.inc:539
+#: html/index.php:258 html/index.php:270 html/index.php:283
+#: plugins/admin/departments/class_department.inc:251
+#: plugins/admin/departments/class_department.inc:380
+#: plugins/admin/groups/class_group.inc:670
 #: plugins/admin/groups/class_group.inc:989
-#: plugins/admin/acl/class_aclRole.inc:613
-#: plugins/admin/acl/class_aclRole.inc:653
-#: plugins/admin/acl/class_aclRole.inc:667
+#: plugins/admin/acl/class_aclRole.inc:557
+#: plugins/admin/acl/class_aclRole.inc:597
+#: plugins/admin/acl/class_aclRole.inc:611
 #: plugins/admin/ogroups/class_ogroup.inc:863
 #: plugins/admin/ogroups/class_ogroup.inc:877
-#: include/simpleplugin/class_simpleService.inc:115
-#: include/simpleplugin/class_simplePlugin.inc:445
-#: include/class_config.inc:330 include/class_acl.inc:1308
-#: include/class_acl.inc:1413 include/class_SnapshotHandler.inc:150
-#: include/class_SnapshotHandler.inc:335 include/class_SnapshotHandler.inc:388
-#: include/class_SnapshotHandler.inc:392 include/class_SnapshotHandler.inc:412
-#: include/class_SnapshotHandler.inc:455 include/class_SnapshotHandler.inc:518
-#: include/class_SnapshotHandler.inc:587 include/class_SnapshotHandler.inc:602
-#: include/class_ldap.inc:934 include/class_ldap.inc:1421
-#: include/class_SnapShotDialog.inc:104 include/class_SnapShotDialog.inc:177
-#: include/class_SnapShotDialog.inc:224 include/functions.inc:547
-#: include/functions.inc:583 include/functions.inc:591
-#: include/functions.inc:639 include/functions.inc:794
-#: include/functions.inc:844 include/functions.inc:904
-#: include/functions.inc:959 include/functions.inc:3094
-#: include/functions.inc:3364
+#: include/simpleplugin/class_simplePlugin.inc:459
+#: include/class_config.inc:335 include/class_acl.inc:1273
+#: include/class_acl.inc:1378 include/class_SnapshotHandler.inc:95
+#: include/class_SnapshotHandler.inc:306 include/class_SnapshotHandler.inc:310
+#: include/class_SnapshotHandler.inc:327 include/class_SnapshotHandler.inc:454
+#: include/class_SnapshotHandler.inc:457 include/class_ldap.inc:910
+#: include/class_ldap.inc:1368 include/functions.inc:528
+#: include/functions.inc:564 include/functions.inc:572
+#: include/functions.inc:620 include/functions.inc:776
+#: include/functions.inc:823 include/functions.inc:884
+#: include/functions.inc:939 include/functions.inc:3038
+#: include/functions.inc:3293
 msgid "LDAP error"
 msgstr "LDAP 错误"
 
-#: setup/class_setupStep_Migrate.inc:1164
-#: setup/class_setupStep_Migrate.inc:1213
+#: setup/class_setupStep_Migrate.inc:1162
+#: setup/class_setupStep_Migrate.inc:1211
 msgid "Cannot move users to the requested department!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
+#: setup/class_setupStep_Migrate.inc:1173
 msgid "Group will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1175
-#: setup/class_setupStep_Migrate.inc:1223 include/class_plugin.inc:1675
+#: setup/class_setupStep_Migrate.inc:1173
+#: setup/class_setupStep_Migrate.inc:1221 include/class_plugin.inc:1658
 msgid "to"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1185
+#: setup/class_setupStep_Migrate.inc:1183
 msgid "Updating following references too"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1223
+#: setup/class_setupStep_Migrate.inc:1221
 msgid "User will be moved from"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1233
+#: setup/class_setupStep_Migrate.inc:1231
 msgid "The following references will be updated"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1814
+#: setup/class_setupStep_Migrate.inc:1800
 msgid ""
 "The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1815
-#: setup/class_setupStep_Migrate.inc:1828
+#: setup/class_setupStep_Migrate.inc:1801
+#: setup/class_setupStep_Migrate.inc:1814
 msgid "Try to create root object"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1827
+#: setup/class_setupStep_Migrate.inc:1813
 msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1882
+#: setup/class_setupStep_Migrate.inc:1868
 #, php-format
 msgid "Missing FusionDirectory object class '%s'!"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1883
+#: setup/class_setupStep_Migrate.inc:1869
 msgid "Please check your installation."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:1904
+#: setup/class_setupStep_Migrate.inc:1890
 #, php-format
 msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2215
+#: setup/class_setupStep_Migrate.inc:2204
 #, php-format
 msgid "Copy '%s' to '%s' failed:"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2350
+#: setup/class_setupStep_Migrate.inc:2335
 #, php-format
 msgid "There are %s devices that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2410
+#: setup/class_setupStep_Migrate.inc:2395
 #, php-format
 msgid "Adding '%s' to the LDAP failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2430
-#: setup/class_setupStep_Migrate.inc:2550
+#: setup/class_setupStep_Migrate.inc:2415
+#: setup/class_setupStep_Migrate.inc:2535
 #, php-format
 msgid "Updating '%s' failed: %s"
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2506
+#: setup/class_setupStep_Migrate.inc:2491
 #, php-format
 msgid "There are %s services that need to be migrated."
 msgstr ""
 
-#: setup/class_setupStep_Migrate.inc:2647
+#: setup/class_setupStep_Migrate.inc:2631
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:138
-#: include/class_msgPool.inc:495 plugins/personal/generic/generic.tpl.c:74
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add"
 msgstr "添加"
 
-#: setup/class_setupStep_Migrate.inc:2648
+#: setup/class_setupStep_Migrate.inc:2632
 #: plugins/admin/departments/dep-list.xml:160
 #: plugins/admin/departments/dep-list.xml:181
 #: plugins/admin/users/user-list.xml:121
@@ -522,13 +505,10 @@ msgstr "添加"
 #: plugins/admin/acl/acl-list.xml:144 plugins/admin/ogroups/ogroup-list.xml:98
 #: include/simpleplugin/simple-list.xml:73
 #: include/simpleplugin/simple-list.xml:122
-#: plugins/personal/generic/generic_certs.tpl.c:8
-#: plugins/personal/generic/generic_certs.tpl.c:14
-#: plugins/personal/generic/generic_certs.tpl.c:20
 msgid "Remove"
 msgstr "删除"
 
-#: setup/class_setupStep_Migrate.inc:2837
+#: setup/class_setupStep_Migrate.inc:2789
 #, php-format
 msgid "There are %s application menus which have to be migrated."
 msgstr ""
@@ -704,7 +684,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:210
 msgid ""
-"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+"Search for 'max_execution_time' in your php.ini and set it to '30' or "
+"higher."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:217
@@ -723,7 +704,8 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:226
 msgid ""
-"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to "
+"'Off'."
 msgstr ""
 
 #: setup/class_setupStep_Checks.inc:236
@@ -818,11 +800,11 @@ msgid ""
 "shouldn't."
 msgstr ""
 
-#: setup/class_setup.inc:195
+#: setup/class_setup.inc:198
 msgid "Completed"
 msgstr ""
 
-#: setup/class_setup.inc:264 setup/setup_migrate.tpl.c:104
+#: setup/class_setup.inc:267 setup/setup_migrate.tpl.c:104
 msgid "Next"
 msgstr ""
 
@@ -869,7 +851,7 @@ msgid "The given password differ value is not numeric."
 msgstr ""
 
 #: html/class_passwordRecovery.inc:126
-#: plugins/personal/generic/class_user.inc:486
+#: plugins/personal/generic/class_user.inc:44
 msgid "Password method"
 msgstr ""
 
@@ -877,48 +859,45 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:226 html/main.php:135
-#: plugins/admin/departments/class_department.inc:431 include/class_xml.inc:60
-#: include/functions.inc:509
+#: html/class_passwordRecovery.inc:227 html/main.php:135
+#: include/class_xml.inc:61 include/functions.inc:490
 msgid "Fatal error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:227
+#: html/class_passwordRecovery.inc:228
 #, php-format
 msgid "FusionDirectory configuration %s/%s is not readable. Aborted."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:296 html/main.php:258 html/index.php:147
-#: html/index.php:208 plugins/admin/groups/class_group.inc:161
-#: plugins/admin/groups/class_group.inc:638
-#: include/simpleplugin/class_simpleService.inc:167
-#: include/class_config.inc:162 include/class_config.inc:654
-#: include/class_config.inc:1150 include/class_config.inc:1163
-#: include/class_config.inc:1181
+#: html/class_passwordRecovery.inc:297 html/main.php:253 html/index.php:148
+#: html/index.php:209 plugins/admin/groups/class_group.inc:161
+#: plugins/admin/groups/class_group.inc:640
+#: include/simpleplugin/class_simpleService.inc:141
+#: include/class_config.inc:165 include/class_config.inc:653
+#: include/class_config.inc:1127 include/class_config.inc:1140
+#: include/class_config.inc:1158
 #: include/password-methods/class_password-methods-sha.inc:71
 #: include/password-methods/class_password-methods-ssha.inc:75
-#: include/class_SnapshotHandler.inc:57 include/class_SnapshotHandler.inc:70
-#: include/class_SnapshotHandler.inc:88 include/class_timezone.inc:60
-#: include/class_pluglist.inc:272 include/functions.inc:779
-#: include/functions.inc:3115
+#: include/class_timezone.inc:60 include/class_pluglist.inc:295
+#: include/functions.inc:761 include/functions.inc:3059
 msgid "Configuration error"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:297 html/setup.php:63 html/index.php:163
+#: html/class_passwordRecovery.inc:298 html/setup.php:63 html/index.php:164
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "目录 '%s' 作为编译目录无法访问!"
 
-#: html/class_passwordRecovery.inc:402
+#: html/class_passwordRecovery.inc:403
 #: plugins/personal/password/class_password.inc:113
-#: plugins/admin/users/class_userManagement.inc:306
+#: plugins/admin/users/class_userManagement.inc:313
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "您输入的“新口令”和“重复新口令”不匹配。"
 
-#: html/class_passwordRecovery.inc:404
-#: plugins/admin/users/class_userManagement.inc:309
+#: html/class_passwordRecovery.inc:405
+#: plugins/admin/users/class_userManagement.inc:315
 #: ihtml/themes/default/recovery.tpl.c:41
 #: ihtml/themes/default/recovery.tpl.c:44
 #: ihtml/themes/default/password.tpl.c:44
@@ -926,67 +905,67 @@ msgstr "您输入的“新口令”和“重复新口令”不匹配。"
 #: ihtml/themes/default/accountexpired.tpl.c:11
 #: ihtml/themes/default/accountexpired.tpl.c:14
 #: plugins/personal/password/password.tpl.c:14
-#: plugins/personal/password/password.tpl.c:38
+#: plugins/personal/password/password.tpl.c:35
 #: plugins/personal/generic/password.tpl.c:11
-#: plugins/personal/generic/password.tpl.c:35
-#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:32
+#: plugins/admin/users/password.tpl.c:8 plugins/admin/users/password.tpl.c:26
 msgid "New password"
 msgstr "新口令"
 
-#: html/class_passwordRecovery.inc:406
+#: html/class_passwordRecovery.inc:407
 msgid "The password used as new is too short."
 msgstr ""
 
-#: html/class_passwordRecovery.inc:408
+#: html/class_passwordRecovery.inc:409
 #: plugins/personal/password/class_password.inc:121
 msgid "The password contains possibly problematic Unicode characters!"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:433
+#: html/class_passwordRecovery.inc:434
 msgid "Session will not be encrypted."
 msgstr "会话不会被加密。"
 
-#: html/class_passwordRecovery.inc:435
+#: html/class_passwordRecovery.inc:436
 msgid "Enter SSL session"
 msgstr "进入 SSL 会话"
 
-#: html/class_passwordRecovery.inc:476
+#: html/class_passwordRecovery.inc:477
 #, php-format
 msgid "Did not found account %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:479
+#: html/class_passwordRecovery.inc:480
 #, php-format
 msgid "Found multiple accounts %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:493 ihtml/themes/default/recovery.tpl.c:83
+#: html/class_passwordRecovery.inc:494 ihtml/themes/default/recovery.tpl.c:83
 msgid "Adresse mail"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:510
+#: html/class_passwordRecovery.inc:511
 #, php-format
 msgid "There is no account using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:513
+#: html/class_passwordRecovery.inc:514
 #, php-format
 msgid "There are several accounts using email %s"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:561
+#: html/class_passwordRecovery.inc:562
 msgid "Contact your administrator, there was a problem with mail server"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:572
+#: html/class_passwordRecovery.inc:573
 msgid "This token is invalid"
 msgstr ""
 
-#: html/class_passwordRecovery.inc:610
+#: html/class_passwordRecovery.inc:611
 msgid "External password changer reported a problem: "
 msgstr "外部口令更改程序报告错误:"
 
-#: html/class_passwordRecovery.inc:635
+#: html/class_passwordRecovery.inc:636
 msgid "There was a problem with mail server, confirmation email not sent"
 msgstr ""
 
@@ -999,132 +978,131 @@ msgstr ""
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
 msgstr ""
 
-#: html/main.php:157
+#: html/main.php:152
 msgid "PHP configuration"
 msgstr ""
 
-#: html/main.php:158
+#: html/main.php:153
 msgid ""
 "Fatal error: Register globals is on. FusionDirectory will refuse to login "
 "unless this is fixed by an administrator."
 msgstr ""
 
-#: html/main.php:188 plugins/personal/password/class_password.inc:156
-#: plugins/personal/password/class_password.inc:162
+#: html/main.php:183 plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:163
 #: plugins/admin/users/class_userManagement.inc:390
 #: ihtml/themes/default/password.tpl.c:20
 msgid "Password change"
 msgstr ""
 
-#: html/main.php:188
+#: html/main.php:183
 msgid "Your password is about to expire, please change your password!"
 msgstr ""
 
-#: html/main.php:258
+#: html/main.php:253
 msgid "Running out of memory!"
 msgstr ""
 
-#: html/main.php:313
+#: html/main.php:309
 msgid "User ACL checks disabled"
 msgstr ""
 
-#: html/main.php:359
+#: html/main.php:354
 msgid "Plugin"
 msgstr ""
 
-#: html/main.php:360
+#: html/main.php:355
 #, php-format
 msgid ""
-"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not "
-"a file)!"
+"Fatal error: Cannot find any plugin definitions for plugin '%s' ('%s' is not"
+" a file)!"
 msgstr ""
 
-#: html/main.php:375
+#: html/main.php:370
 msgid "Configuration Error"
 msgstr ""
 
-#: html/main.php:376
+#: html/main.php:371
 #, php-format
 msgid ""
 "Fatal error: not all POST variables have been transfered by PHP - please "
 "inform your administrator!"
 msgstr ""
 
-#: html/index.php:58
+#: html/index.php:59
 msgid "Session is not encrypted!"
 msgstr ""
 
-#: html/index.php:65
+#: html/index.php:66
 msgid ""
 "The session lifetime configured in your fusiondirectory.conf will be "
 "overridden by php.ini settings."
 msgstr ""
 
-#: html/index.php:147
+#: html/index.php:148
 #, php-format
 msgid ""
 "FusionDirectory configuration %s/%s is not readable. Please run "
 "fusiondirectory-setup --check-config to fix this."
 msgstr ""
 
-#: html/index.php:163
+#: html/index.php:164
 msgid "Smarty error"
 msgstr ""
 
-#: html/index.php:208
+#: html/index.php:209
 msgid "There is a problem with the authentication setup!"
 msgstr ""
 
-#: html/index.php:216
+#: html/index.php:217
 msgid "Cannot find a valid user for the current authentication setup!"
 msgstr ""
 
-#: html/index.php:220
+#: html/index.php:221
 msgid "User information is not unique across the configured LDAP trees!"
 msgstr ""
 
-#: html/index.php:269
+#: html/index.php:270
 msgid "Cannot detect information about the installed LDAP schema!"
 msgstr ""
 
-#: html/index.php:282
+#: html/index.php:283
 msgid "Your LDAP setup contains old schema definitions:"
 msgstr ""
 
-#: html/index.php:305
+#: html/index.php:306
 msgid "Please specify a valid username!"
 msgstr "请输入一个有效的用户名!"
 
-#: html/index.php:308
+#: html/index.php:309
 msgid "Please specify your password!"
 msgstr "请输入您的口令!"
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Authentication error"
 msgstr ""
 
-#: html/index.php:320
+#: html/index.php:321
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:327
+#: html/index.php:328
 msgid "Please check the username/password combination."
 msgstr "请检查用户名/口令。"
 
-#: html/index.php:381
+#: html/index.php:382
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:403
+#: html/index.php:404
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr "您的浏览器已经禁用 cookies。请启用 cookies 并在登录前重新加载本页面!"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:40
-#, fuzzy
 msgid "Hair Information"
-msgstr "提示信息"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:44
 msgid "Color"
@@ -1163,25 +1141,20 @@ msgid "Does the bicycle have a bell"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:84
-#, fuzzy
 msgid "FTP informations"
-msgstr "切换信息"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:87
 msgid "Informations for ftp login"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:90
-#: plugins/personal/generic/class_user.inc:1136
-#: plugins/personal/generic/class_user.inc:1154
-#: plugins/personal/generic/class_user.inc:1167
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:209
 #: plugins/admin/users/user-list.xml:65
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/groups/userSelect/user-list.xml:56
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/personal/generic/paste_generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:29
 #: plugins/admin/users/template.tpl.c:17
 msgid "Login"
 msgstr "登录名"
@@ -1191,7 +1164,9 @@ msgid "Login for FTP"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#: plugins/personal/password/class_password.inc:199
+#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/generic/class_user.inc:49
+#: plugins/personal/generic/class_user.inc:218
 #: ihtml/themes/default/login.tpl.c:17 ihtml/themes/default/login.tpl.c:20
 #: ihtml/themes/default/login.tpl.c:23 ihtml/themes/default/recovery.tpl.c:5
 #: ihtml/themes/default/recovery.tpl.c:8
@@ -1203,9 +1178,8 @@ msgid "Password"
 msgstr "口令"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:91
-#, fuzzy
 msgid "Password for FTP"
-msgstr "口令存储"
+msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:92
 msgid "Host"
@@ -1217,7 +1191,7 @@ msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port"
-msgstr ""
+msgstr "端口"
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:93
 msgid "Port for FTP"
@@ -1228,9 +1202,17 @@ msgid "Demo Plugin"
 msgstr ""
 
 #: contrib/develop/simple-plugin/demoPlugin/class_demoPlugin.inc:108
-#, fuzzy
 msgid "Edit some useless personal information"
-msgstr "个人信息"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:8
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:12
+msgid "Diagram"
+msgstr ""
+
+#: contrib/develop/debug-help/addons/debug-help/class_debugHelp.inc:9
+msgid "Debug diagram help"
+msgstr ""
 
 #: plugins/generic/welcome/main.inc:26
 #, php-format
@@ -1238,48 +1220,48 @@ msgid "Welcome %s!"
 msgstr "欢迎 %s!"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/personal/generic/class_user.inc:1369
-#: plugins/personal/posix/class_posixAccount.inc:92
-#: plugins/admin/departments/class_department.inc:653
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/personal/generic/class_user.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:78
+#: plugins/admin/departments/class_department.inc:473
+#: plugins/admin/users/class_userManagement.inc:867
 #: plugins/admin/groups/class_group.inc:1106
 #: plugins/admin/ogroups/class_ogroup.inc:895 setup/setup_feedback.tpl.c:23
 msgid "Generic"
 msgstr "通用配置"
 
-#: plugins/generic/references/class_reference.inc:43
+#: plugins/generic/references/class_reference.inc:45
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/generic/references/class_reference.inc:45
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:65
+#: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:109
-#: plugins/admin/ogroups/tabs_ogroups.inc:100
+#: plugins/admin/ogroups/tabs_ogroups.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:67
 #: ihtml/themes/default/recovery.tpl.c:86
 msgid "Mail"
 msgstr "邮件"
 
-#: plugins/generic/references/class_reference.inc:47
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:73
+#: plugins/generic/references/class_reference.inc:53
 #: plugins/admin/groups/class_groupManagement.inc:117
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:75
 msgid "Samba"
 msgstr "Samba"
 
-#: plugins/generic/references/class_reference.inc:49
+#: plugins/generic/references/class_reference.inc:57
 msgid "FAX"
 msgstr "传真"
 
-#: plugins/generic/references/class_reference.inc:51
+#: plugins/generic/references/class_reference.inc:61
 msgid "Proxy"
 msgstr "代理"
 
-#: plugins/generic/references/class_reference.inc:53
+#: plugins/generic/references/class_reference.inc:65
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/generic/references/class_reference.inc:55
+#: plugins/generic/references/class_reference.inc:69
 #: plugins/personal/posix/groupSelect/group-list.xml:15
-#: plugins/admin/groups/class_group.inc:1110
+#: plugins/admin/groups/class_group.inc:1111
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:96
@@ -1288,65 +1270,62 @@ msgstr "FTP"
 msgid "Group"
 msgstr "组"
 
-#: plugins/generic/references/class_reference.inc:57
-#: plugins/personal/generic/class_user.inc:1394
-#: plugins/admin/departments/class_department.inc:657
+#: plugins/generic/references/class_reference.inc:73
+#: plugins/personal/generic/class_user.inc:276
+#: plugins/admin/departments/class_department.inc:477
 #: plugins/admin/departments/dep-list.xml:55
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:255
+#: plugins/admin/departments/class_departmentManagement.inc:247
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:15
-#: plugins/personal/generic/generic.tpl.c:83
 msgid "Department"
 msgstr "部门"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/personal/generic/class_user.inc:1178
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:81
-#: plugins/admin/departments/class_department.inc:368
+#: plugins/generic/references/class_reference.inc:77
+#: plugins/personal/generic/class_user.inc:250
+#: plugins/admin/departments/class_department.inc:330
 #: plugins/admin/groups/class_groupManagement.inc:125
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
-#: plugins/personal/generic/generic.tpl.c:101
-#: plugins/personal/generic/generic.tpl.c:155
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:83
 #: plugins/admin/departments/organization.tpl.c:50
 #: plugins/admin/departments/generic.tpl.c:50
 msgid "Phone"
 msgstr "电话"
 
-#: plugins/generic/references/class_reference.inc:61
+#: plugins/generic/references/class_reference.inc:81
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:87
 msgid "Application"
 msgstr "应用程序"
 
-#: plugins/generic/references/class_reference.inc:63
-#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: plugins/generic/references/class_reference.inc:85
 #: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:14
 #: setup/setup_config2.tpl.c:17 setup/setup_config2.tpl.c:32
 msgid "Server"
 msgstr "服务器"
 
-#: plugins/generic/references/class_reference.inc:65
+#: plugins/generic/references/class_reference.inc:89
 msgid "Thin Client"
 msgstr "瘦客户机"
 
-#: plugins/generic/references/class_reference.inc:67
-#: plugins/personal/posix/trustSelect/trust-list.xml:22
+#: plugins/generic/references/class_reference.inc:93
 #: plugins/admin/ogroups/class_ogroupManagement.inc:192
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:22
 msgid "Workstation"
 msgstr "工作站"
 
-#: plugins/generic/references/class_reference.inc:69
+#: plugins/generic/references/class_reference.inc:97
 #: plugins/admin/ogroups/class_ogroup.inc:901
 #: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "对象组"
 
-#: plugins/generic/references/class_reference.inc:71
+#: plugins/generic/references/class_reference.inc:101
 #: plugins/admin/ogroups/class_ogroupManagement.inc:195
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 msgid "Printer"
@@ -1381,469 +1360,461 @@ msgstr ""
 msgid "FusionDirectory configuration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:64
+#: plugins/config/class_configInLdap.inc:65
 msgid "Addons"
 msgstr "插件"
 
-#: plugins/config/class_configInLdap.inc:79
+#: plugins/config/class_configInLdap.inc:81
 msgid "Look n feel"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid "Language"
 msgstr "语言"
 
-#: plugins/config/class_configInLdap.inc:82
+#: plugins/config/class_configInLdap.inc:84
 msgid ""
 "Language of the application. If 'automatic' or not available, the one asked "
 "by the browser will be used. This setting can be overriden per user."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87 setup/setup_config1.tpl.c:5
+#: plugins/config/class_configInLdap.inc:89 setup/setup_config1.tpl.c:5
 msgid "Theme"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:87
+#: plugins/config/class_configInLdap.inc:89
 msgid "Theme to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93 setup/setup_config2.tpl.c:2
+#: plugins/config/class_configInLdap.inc:95 setup/setup_config2.tpl.c:2
 msgid "Timezone"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:93
+#: plugins/config/class_configInLdap.inc:95
 msgid "Timezone to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:100
+#: plugins/config/class_configInLdap.inc:102
 msgid "Schema setup"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:103
+#: plugins/config/class_configInLdap.inc:105
 msgid "rfc2307bis"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:104
+#: plugins/config/class_configInLdap.inc:106
 msgid ""
 "Enables rfc2307bis style groups. You can use member attributes instead of "
 "memberUid in this case."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:109
+#: plugins/config/class_configInLdap.inc:111
 msgid "schemaCheck"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:110
+#: plugins/config/class_configInLdap.inc:112
 msgid "Enables schema checking during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:117
+#: plugins/config/class_configInLdap.inc:119
 #: plugins/personal/password/main.inc:54 setup/setup_config1.tpl.c:38
 msgid "Password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Password default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:120
+#: plugins/config/class_configInLdap.inc:122
 msgid "Default hash to be used"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force default hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:125
+#: plugins/config/class_configInLdap.inc:127
 msgid "Force the use of the default password hash"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129 setup/setup_config1.tpl.c:47
+#: plugins/config/class_configInLdap.inc:131 setup/setup_config1.tpl.c:47
 #: setup/setup_config1.tpl.c:50
 msgid "Password minimum length"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:129
+#: plugins/config/class_configInLdap.inc:131
 msgid "Minimum length of user passwords"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Password minimum differs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:134
+#: plugins/config/class_configInLdap.inc:136
 msgid "Minimum number of different characters from last password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "Password hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:139
+#: plugins/config/class_configInLdap.inc:141
 msgid "External script to handle password settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:143 setup/setup_config1.tpl.c:62
+#: plugins/config/class_configInLdap.inc:145 setup/setup_config1.tpl.c:62
 msgid "Use account expiration"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:144
+#: plugins/config/class_configInLdap.inc:146
 msgid ""
 "Enables shadow attribute tests during the login to FusionDirectory and "
 "forces password renewal or account locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:148
+#: plugins/config/class_configInLdap.inc:150
 msgid "SASL Realm"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "SASL Exop"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:152
+#: plugins/config/class_configInLdap.inc:154
 msgid "Attribute to be stored in the userPassword attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:158
+#: plugins/config/class_configInLdap.inc:160
 msgid "Core settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:161 setup/setup_config3.tpl.c:5
+#: plugins/config/class_configInLdap.inc:163 setup/setup_config3.tpl.c:5
 msgid "Enable primary group filter"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:162
+#: plugins/config/class_configInLdap.inc:164
 msgid ""
-"It is time consuming to evaluate which groups are primary and which are not, "
-"so you may want to disable it if your group plugin is slow."
+"It is time consuming to evaluate which groups are primary and which are not,"
+" so you may want to disable it if your group plugin is slow."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:167 setup/setup_config3.tpl.c:8
+#: plugins/config/class_configInLdap.inc:169 setup/setup_config3.tpl.c:8
 msgid "Display summary in listings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:168
+#: plugins/config/class_configInLdap.inc:170
 msgid ""
 "Determines whether a status bar will be shown on the bottom of lists, "
 "displaying a short summary of type and number of elements in the list."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:173 setup/setup_config3.tpl.c:11
-msgid "Honour administrative units"
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:174
-msgid ""
-"Enables  checking  of unitTag attributes when using administrative units."
-msgstr ""
-
-#: plugins/config/class_configInLdap.inc:178
+#: plugins/config/class_configInLdap.inc:175
 msgid "Edit locking"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:179
+#: plugins/config/class_configInLdap.inc:176
 msgid ""
 "Check if a entry currently being edited has been modified outside of "
 "FusionDirectory in the meantime."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:184 setup/setup_config3.tpl.c:17
+#: plugins/config/class_configInLdap.inc:181 setup/setup_config3.tpl.c:14
 msgid "Enable Copy & Paste"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:185
+#: plugins/config/class_configInLdap.inc:182
 msgid "Enables copy and paste for LDAP entries managed with FusionDirectory."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:189
+#: plugins/config/class_configInLdap.inc:186
 msgid "Enable logging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:190
+#: plugins/config/class_configInLdap.inc:187
 msgid "Event logging on FusionDirectory side."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "LDAP size limit"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:195
+#: plugins/config/class_configInLdap.inc:192
 msgid "Defines the number of entries to get from LDAP by default."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
+#: plugins/config/class_configInLdap.inc:199 setup/setup_config3.tpl.c:20
 msgid "Login and session"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:205 setup/setup_config3.tpl.c:26
+#: plugins/config/class_configInLdap.inc:202 setup/setup_config3.tpl.c:23
 msgid "Login attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:206
+#: plugins/config/class_configInLdap.inc:203
 msgid "Which LDAP attribute should be used as the login name during login."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:212 setup/setup_config3.tpl.c:32
+#: plugins/config/class_configInLdap.inc:209 setup/setup_config3.tpl.c:29
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:213
+#: plugins/config/class_configInLdap.inc:210
 msgid ""
 "Enables PHP security checks to force encrypted access (https) to the web "
 "interface."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:217 setup/setup_config3.tpl.c:35
+#: plugins/config/class_configInLdap.inc:214 setup/setup_config3.tpl.c:32
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:218
+#: plugins/config/class_configInLdap.inc:215
 msgid "will display a warning to the user when http is used instead of https."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:223 setup/setup_config3.tpl.c:38
+#: plugins/config/class_configInLdap.inc:220 setup/setup_config3.tpl.c:35
 msgid "Remember dialog filter settings"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:224
+#: plugins/config/class_configInLdap.inc:221
 msgid "Store filter and plugin settings inside of a cookie."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229 setup/setup_config3.tpl.c:41
+#: plugins/config/class_configInLdap.inc:226 setup/setup_config3.tpl.c:38
 msgid "Session lifetime"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:229
+#: plugins/config/class_configInLdap.inc:226
 msgid "Defines when a session will expire in seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:8
+#: plugins/config/class_configInLdap.inc:233 setup/setup_config2.tpl.c:8
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239 setup/setup_config2.tpl.c:11
+#: plugins/config/class_configInLdap.inc:236 setup/setup_config2.tpl.c:11
 #: setup/setup_config2.tpl.c:26
 msgid "Enable snapshots"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:239
+#: plugins/config/class_configInLdap.inc:236
 msgid ""
-"This enables you to save certain states of entries and restore them later on."
+"This enables you to save certain states of entries and restore them later "
+"on."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243 setup/setup_config2.tpl.c:14
+#: plugins/config/class_configInLdap.inc:240 setup/setup_config2.tpl.c:14
 #: setup/setup_config2.tpl.c:29
 msgid "Snapshot base"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:243
+#: plugins/config/class_configInLdap.inc:240
 msgid "The base where snapshots should be stored inside of the LDAP."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "Snapshot server"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:247
+#: plugins/config/class_configInLdap.inc:244
 msgid "LDAP URI for the server which is used to do object snapshots."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid "Snapshot user"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:251
+#: plugins/config/class_configInLdap.inc:248
 msgid ""
 "The user which is used to authenticate when connecting to snapshot server."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid "Snapshot password"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:255
+#: plugins/config/class_configInLdap.inc:252
 msgid ""
-"The credentials which are used in combination with snapshot user in order to "
-"authenticate."
+"The credentials which are used in combination with snapshot user in order to"
+" authenticate."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:261
+#: plugins/config/class_configInLdap.inc:258
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: plugins/config/class_configInLdap.inc:266
+#: plugins/config/class_configInLdap.inc:263
 msgid "Hooks that are called when specific actions happens"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "tab"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:270
+#: plugins/config/class_configInLdap.inc:267
 msgid "The tab that this hook concerns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "mode"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:275
+#: plugins/config/class_configInLdap.inc:272
 msgid "When to call this command"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "cmd"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:281
+#: plugins/config/class_configInLdap.inc:278
 msgid "The command that will be called"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:288
+#: plugins/config/class_configInLdap.inc:285
 msgid "Hooks"
 msgstr "钩子"
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available shells"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:296
+#: plugins/config/class_configInLdap.inc:293
 msgid "Available POSIX shells for FD users."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:305 setup/setup_config1.tpl.c:8
+#: plugins/config/class_configInLdap.inc:302 setup/setup_config1.tpl.c:8
 msgid "People and group storage"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310 setup/setup_config1.tpl.c:11
+#: plugins/config/class_configInLdap.inc:306 setup/setup_config1.tpl.c:11
 msgid "People DN attribute"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:310
+#: plugins/config/class_configInLdap.inc:306
 msgid "Attribute to use at the beginning of users dn"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:315
-#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:23
+#: plugins/config/class_configInLdap.inc:311
+#: plugins/config/class_configInLdap.inc:312 setup/setup_config1.tpl.c:23
 msgid "Include personal title in user DN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320 setup/setup_config1.tpl.c:14
+#: plugins/config/class_configInLdap.inc:316 setup/setup_config1.tpl.c:14
 msgid "Customized CN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:320
+#: plugins/config/class_configInLdap.inc:316
 msgid "Use a placeholder pattern for generating account cns"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid "Next id hook"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:324
+#: plugins/config/class_configInLdap.inc:320
 msgid ""
 "A script to be called for finding the next free id for users or groups "
 "externaly."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328 setup/setup_config1.tpl.c:29
+#: plugins/config/class_configInLdap.inc:324 setup/setup_config1.tpl.c:29
 msgid "Automatic UIDs"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:328
+#: plugins/config/class_configInLdap.inc:324
 msgid "Automatic way to generate new user ids"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:332
+#: plugins/config/class_configInLdap.inc:328
 msgid "Strict naming policy"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:333
+#: plugins/config/class_configInLdap.inc:329
 msgid "Enables strict checking of uids and group names"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:338
+#: plugins/config/class_configInLdap.inc:334
 msgid "GID/UID min id"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:339
+#: plugins/config/class_configInLdap.inc:335
 msgid ""
 "The minimum assignable user or group id to avoid security leaks with uid 0 "
 "accounts."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:344
+#: plugins/config/class_configInLdap.inc:340
 msgid "Number base for people"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:345
+#: plugins/config/class_configInLdap.inc:341
 msgid "Where to start looking for a new free user id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:350
+#: plugins/config/class_configInLdap.inc:346
 msgid "Number base for groups"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:351
+#: plugins/config/class_configInLdap.inc:347
 msgid "Where to start looking for a new free group id."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "Users RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:356
+#: plugins/config/class_configInLdap.inc:352
 msgid "The branch where user are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "Groups RDN"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:361
+#: plugins/config/class_configInLdap.inc:357
 msgid "The branch where groups are stored."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:368 setup/setup_config3.tpl.c:44
+#: plugins/config/class_configInLdap.inc:364 setup/setup_config3.tpl.c:41
 msgid "Debugging"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:371
+#: plugins/config/class_configInLdap.inc:367
 msgid "Display errors"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:372
+#: plugins/config/class_configInLdap.inc:368
 msgid ""
-"Shows PHP errors in the upper part of the screen. This should be disabled in "
-"productive deployments, because there might be some passwords in it."
+"Shows PHP errors in the upper part of the screen. This should be disabled in"
+" productive deployments, because there might be some passwords in it."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376 setup/setup_config3.tpl.c:50
+#: plugins/config/class_configInLdap.inc:372 setup/setup_config3.tpl.c:47
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:376
+#: plugins/config/class_configInLdap.inc:372
 msgid ""
 "Stop LDAP actions if there is no answer within the specified number of "
 "seconds."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:381 setup/setup_config3.tpl.c:53
+#: plugins/config/class_configInLdap.inc:377 setup/setup_config3.tpl.c:50
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:382
+#: plugins/config/class_configInLdap.inc:378
 msgid ""
 "Track LDAP timing statistics to the syslog. This may help to find indexing "
 "problems or bad search filters."
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:387 setup/setup_config3.tpl.c:56
+#: plugins/config/class_configInLdap.inc:383 setup/setup_config3.tpl.c:53
 msgid "Debug level"
 msgstr ""
 
-#: plugins/config/class_configInLdap.inc:388
+#: plugins/config/class_configInLdap.inc:384
 msgid "Display certain information on each page load."
 msgstr ""
 
@@ -1872,262 +1843,50 @@ msgid "The password used as new is to short."
 msgstr "输入的新口令太短了。"
 
 #: plugins/personal/password/class_password.inc:136
-#: plugins/admin/users/class_userManagement.inc:341
+#: plugins/admin/users/class_userManagement.inc:346
 #, php-format
 msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:157
+#: plugins/personal/password/class_password.inc:158
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "您输入的当前口令不正确。"
 
-#: plugins/personal/password/class_password.inc:163
+#: plugins/personal/password/class_password.inc:164
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:200
+#: plugins/personal/password/class_password.inc:201
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/generic/main.inc:169
-msgid "Generic user information"
-msgstr "用户一般信息"
-
-#: plugins/personal/generic/class_user.inc:279
-#: plugins/admin/departments/class_department.inc:145
-#: include/class_pluglist.inc:294 include/class_pluglist.inc:295
-#: include/class_pluglist.inc:368
-msgid "Unknown"
-msgstr "未知"
-
-#: plugins/personal/generic/class_user.inc:307
-msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "female"
-msgstr "女"
-
-#: plugins/personal/generic/class_user.inc:375
-msgid "male"
-msgstr "ç”·"
-
-#: plugins/personal/generic/class_user.inc:443
-msgid "Cannot upload file!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:486
-msgid "The selected password method is no longer available."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:887
-msgid ""
-"Cannot save user picture, FusionDirectory requires the package 'php5-"
-"imagick' to be installed!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1005
-msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1012
-msgid "Cannot build RDN: attribute is not defined!"
+#: plugins/personal/generic/class_user.inc:44
+msgid "Password hash method to use"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1030
-msgid "Cannot build RDN: invalid attribute parameters!"
+#: plugins/personal/generic/class_user.inc:49
+msgid "Password (Leave empty if you do not wish to change it)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1109
-msgid "The selected password method requires initial configuration!"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Password again"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1141
-#: plugins/personal/generic/class_user.inc:1159
-#: plugins/personal/generic/class_user.inc:1201
-#: plugins/personal/posix/groupSelect/group-list.xml:41
-#: plugins/personal/posix/trustSelect/trust-list.xml:64
-#: plugins/admin/departments/class_organizationGeneric.inc:79
-#: plugins/admin/departments/class_organizationGeneric.inc:81
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_organizationGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:47
-#: plugins/admin/departments/class_dcObject.inc:49
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:56
-#: plugins/admin/departments/class_dcObject.inc:58
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/class_department.inc:347
-#: plugins/admin/departments/class_department.inc:349
-#: plugins/admin/departments/class_department.inc:354
-#: plugins/admin/departments/class_department.inc:361
-#: plugins/admin/departments/class_department.inc:365
-#: plugins/admin/departments/class_domain.inc:47
-#: plugins/admin/departments/class_domain.inc:49
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:56
-#: plugins/admin/departments/class_domain.inc:58
-#: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/class_countryGeneric.inc:47
-#: plugins/admin/departments/class_countryGeneric.inc:49
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_countryGeneric.inc:56
-#: plugins/admin/departments/class_countryGeneric.inc:58
-#: plugins/admin/departments/class_localityGeneric.inc:48
-#: plugins/admin/departments/class_localityGeneric.inc:50
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_localityGeneric.inc:57
-#: plugins/admin/departments/class_localityGeneric.inc:59
-#: plugins/admin/users/class_userManagement.inc:542
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/groups/class_group.inc:1016
-#: plugins/admin/groups/class_group.inc:1027
-#: plugins/admin/groups/class_group.inc:1029
-#: plugins/admin/groups/class_group.inc:1046
-#: plugins/admin/groups/class_group.inc:1060
-#: plugins/admin/groups/class_group.inc:1067
-#: plugins/admin/groups/class_group.inc:1113
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
-#: plugins/admin/groups/group-list.xml:58
-#: plugins/admin/acl/class_aclRole.inc:702
-#: plugins/admin/acl/class_aclRole.inc:715
-#: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/class_ogroup.inc:752
-#: plugins/admin/ogroups/class_ogroup.inc:756
-#: plugins/admin/ogroups/class_ogroup.inc:905
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: include/simpleplugin/simple-list.xml:32
-#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
-#: setup/setup_feedback.tpl.c:11
-#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:17
-#: plugins/admin/departments/dep-filter.tpl.c:5
-#: plugins/admin/users/user-filter.tpl.c:20
-#: plugins/admin/groups/group-filter.tpl.c:14
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
-#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
-#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
-#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
-#: plugins/admin/acl/paste_role.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
-#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
-msgid "Name"
-msgstr "名称"
-
-#: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1198
-#: plugins/personal/generic/class_user.inc:1379
-#: plugins/admin/users/user-list.xml:57
-#: plugins/admin/users/class_userManagement.inc:545
-#: plugins/admin/groups/userSelect/user-list.xml:40
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-msgid "Given name"
-msgstr "名"
-
-#: plugins/personal/generic/class_user.inc:1173
-#: plugins/personal/generic/class_user.inc:1413
-#: plugins/personal/generic/generic.tpl.c:59
-msgid "Homepage"
-msgstr "个人主页"
-
-#: plugins/personal/generic/class_user.inc:1181
-#: plugins/admin/departments/class_organizationGeneric.inc:132
-#: plugins/admin/departments/class_department.inc:371
-#: plugins/admin/departments/class_department.inc:669
-#: plugins/personal/generic/generic.tpl.c:110
-#: plugins/personal/generic/generic.tpl.c:161
-#: plugins/admin/departments/organization.tpl.c:56
-#: plugins/admin/departments/generic.tpl.c:56
-msgid "Fax"
-msgstr "传真"
-
-#: plugins/personal/generic/class_user.inc:1184
-#: plugins/personal/generic/generic.tpl.c:104
-msgid "Mobile"
-msgstr "手机"
-
-#: plugins/personal/generic/class_user.inc:1187
-#: plugins/personal/generic/generic.tpl.c:107
-msgid "Pager"
-msgstr "呼机"
-
-#: plugins/personal/generic/class_user.inc:1192
-#: plugins/personal/generic/class_user.inc:1384
-#: plugins/personal/generic/generic.tpl.c:38
-msgid "Date of birth"
-msgstr "生日"
-
-#: plugins/personal/generic/class_user.inc:1355
-#: plugins/personal/generic/generic.tpl.c:140
-msgid "Unit"
-msgstr "单元"
-
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/generic.tpl.c:149
-msgid "House identifier"
-msgstr "家庭角色"
-
-#: plugins/personal/generic/class_user.inc:1357
-#: plugins/personal/generic/generic.tpl.c:122
-msgid "Vocation"
-msgstr "行业"
-
-#: plugins/personal/generic/class_user.inc:1358
-#: plugins/personal/generic/generic.tpl.c:164
-msgid "Last delivery"
-msgstr "最后传递"
-
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/generic.tpl.c:137
-msgid "Person locality"
+#: plugins/personal/generic/class_user.inc:53
+msgid "Same password as above, to avoid errors"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1360
-#: plugins/personal/generic/generic.tpl.c:125
-msgid "Unit description"
-msgstr "单元描述"
-
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/personal/generic/generic.tpl.c:128
-msgid "Subject area"
+#: plugins/personal/generic/class_user.inc:128
+msgid "Passwords does not match"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/generic.tpl.c:131
-msgid "Functional title"
-msgstr "单位职称"
-
-#: plugins/personal/generic/class_user.inc:1363
-#: plugins/personal/generic/generic.tpl.c:167
-msgid "Public visible"
-msgstr "公开"
-
-#: plugins/personal/generic/class_user.inc:1364
-#: plugins/personal/generic/generic.tpl.c:143
-msgid "Street"
-msgstr "街道"
-
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/admin/acl/class_aclRole.inc:695 plugins/admin/acl/acl-list.xml:23
-#: plugins/personal/generic/generic.tpl.c:134
-msgid "Role"
-msgstr "角色"
-
-#: plugins/personal/generic/class_user.inc:1366
-#: plugins/personal/generic/generic.tpl.c:146
-msgid "Postal code"
-msgstr "邮编"
-
-#: plugins/personal/generic/class_user.inc:1370
+#: plugins/personal/generic/class_user.inc:142
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:146
 #: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
 #: plugins/admin/groups/userSelect/user-list.xml:14
@@ -2138,122 +1897,76 @@ msgstr ""
 msgid "User"
 msgstr "用户"
 
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/admin/users/user-list.xml:49
-#: plugins/admin/groups/userSelect/user-list.xml:48
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
-msgid "Surname"
+#: plugins/personal/generic/class_user.inc:160
+msgid "Personal information"
+msgstr "个人信息"
+
+#: plugins/personal/generic/class_user.inc:165
+#: plugins/personal/generic/paste_generic.tpl.c:5
+#: plugins/admin/users/template.tpl.c:11
+msgid "Last name"
 msgstr "å§“"
 
-#: plugins/personal/generic/class_user.inc:1380
-msgid "User identification"
+#: plugins/personal/generic/class_user.inc:165
+msgid "Last name of this user"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:170
+#: plugins/personal/generic/paste_generic.tpl.c:8
+#: plugins/admin/users/template.tpl.c:14
+msgid "First name"
+msgstr "名"
+
+#: plugins/personal/generic/class_user.inc:170
+msgid "First name of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/personal/generic/generic.tpl.c:32
+#: plugins/personal/generic/class_user.inc:175
 msgid "Personal title"
 msgstr "个人称谓"
 
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/personal/generic/generic.tpl.c:35
+#: plugins/personal/generic/class_user.inc:179
 msgid "Academic title"
 msgstr "学位头衔"
 
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/personal/generic/generic.tpl.c:41
+#: plugins/personal/generic/class_user.inc:183
+msgid "Date of birth"
+msgstr "生日"
+
+#: plugins/personal/generic/class_user.inc:188
 msgid "Sex"
 msgstr "性别"
 
-#: plugins/personal/generic/class_user.inc:1386
-msgid "Preferred language"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1387
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_dcObject.inc:92
-#: plugins/admin/departments/class_department.inc:663
-#: plugins/admin/departments/class_domain.inc:92
-#: plugins/admin/departments/class_countryGeneric.inc:92
-#: plugins/admin/departments/class_localityGeneric.inc:93
-#: plugins/admin/groups/class_group.inc:1115
-#: plugins/admin/acl/class_aclRole.inc:703
-#: plugins/admin/ogroups/class_ogroup.inc:906
-#: include/simpleplugin/class_attribute.inc:1244
-#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
-#: plugins/personal/generic/generic.tpl.c:50
-#: plugins/personal/posix/groupSelect/group-list.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-list.tpl.c:2
-#: plugins/admin/departments/dcObject.tpl.c:17
-#: plugins/admin/departments/dep-list.tpl.c:2
-#: plugins/admin/departments/locality.tpl.c:17
-#: plugins/admin/departments/country.tpl.c:17
-#: plugins/admin/departments/organization.tpl.c:23
-#: plugins/admin/departments/generic.tpl.c:23
-#: plugins/admin/departments/domain.tpl.c:17
-#: plugins/admin/users/user-list.tpl.c:2
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl.c:2
-#: plugins/admin/groups/userSelect/user-list.tpl.c:2
-#: plugins/admin/groups/singleUserSelect/singleUser-list.tpl.c:2
-#: plugins/admin/groups/group-list.tpl.c:2
-#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
-#: plugins/admin/acl/acl-list.tpl.c:2
-#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl.c:2
-#: plugins/admin/ogroups/ogroup-list.tpl.c:2
-#: plugins/admin/ogroups/generic.tpl.c:14
-msgid "Base"
-msgstr "位置"
-
-#: plugins/personal/generic/class_user.inc:1389
-#: plugins/personal/generic/paste_generic.tpl.c:26
-msgid "User picture"
-msgstr "用户图片"
-
-#: plugins/personal/generic/class_user.inc:1391
-msgid "Login restrictions"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1393
-#: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/admin/departments/class_organizationGeneric.inc:115
-#: plugins/admin/departments/class_organizationGeneric.inc:118
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:243
-#: setup/setup_feedback.tpl.c:8 plugins/personal/generic/generic.tpl.c:80
-msgid "Organization"
-msgstr "组织/公司"
-
-#: plugins/personal/generic/class_user.inc:1395
-msgid "Department number"
+#: plugins/personal/generic/class_user.inc:188
+msgid "Gender"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:193
 #: plugins/personal/posix/groupSelect/group-list.xml:49
-#: plugins/personal/posix/trustSelect/trust-list.xml:72
 #: plugins/admin/departments/class_organizationGeneric.inc:95
-#: plugins/admin/departments/class_organizationGeneric.inc:122
+#: plugins/admin/departments/class_organizationGeneric.inc:126
 #: plugins/admin/departments/class_dcObject.inc:63
-#: plugins/admin/departments/class_dcObject.inc:90
-#: plugins/admin/departments/class_department.inc:357
-#: plugins/admin/departments/class_department.inc:661
+#: plugins/admin/departments/class_dcObject.inc:94
+#: plugins/admin/departments/class_department.inc:319
+#: plugins/admin/departments/class_department.inc:481
 #: plugins/admin/departments/class_domain.inc:63
-#: plugins/admin/departments/class_domain.inc:91
+#: plugins/admin/departments/class_domain.inc:95
 #: plugins/admin/departments/dep-list.xml:79
 #: plugins/admin/departments/class_countryGeneric.inc:63
-#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_countryGeneric.inc:94
 #: plugins/admin/departments/class_localityGeneric.inc:64
-#: plugins/admin/departments/class_localityGeneric.inc:91
-#: plugins/admin/groups/class_group.inc:1114
+#: plugins/admin/departments/class_localityGeneric.inc:95
+#: plugins/admin/groups/class_group.inc:1117
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:57
 #: plugins/admin/groups/group-list.xml:66
-#: plugins/admin/acl/class_aclRole.inc:704 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/class_aclRole.inc:652 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:120
-#: plugins/admin/ogroups/class_ogroup.inc:907
+#: plugins/admin/ogroups/class_ogroup.inc:908
 #: plugins/admin/ogroups/ogroup-list.xml:49
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:72
 #: include/simpleplugin/simple-list.xml:40
-#: include/class_SnapShotDialog.inc:351
+#: include/class_SnapShotDialog.inc:230
 #: plugins/generic/references/contents.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:47
 #: plugins/admin/departments/dcObject.tpl.c:11
 #: plugins/admin/departments/locality.tpl.c:11
 #: plugins/admin/departments/country.tpl.c:11
@@ -2265,66 +1978,52 @@ msgstr ""
 msgid "Description"
 msgstr "描述"
 
-#: plugins/personal/generic/class_user.inc:1397
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-#: plugins/admin/departments/class_dcObject.inc:91
-#: plugins/admin/departments/class_department.inc:670
-#: plugins/admin/departments/class_domain.inc:93
-#: plugins/admin/departments/class_countryGeneric.inc:91
-#: plugins/admin/departments/class_localityGeneric.inc:92
-#: plugins/personal/generic/generic.tpl.c:95
-#: plugins/admin/departments/dcObject.tpl.c:20
-#: plugins/admin/departments/locality.tpl.c:20
-#: plugins/admin/departments/country.tpl.c:20
-#: plugins/admin/departments/organization.tpl.c:26
-#: plugins/admin/departments/generic.tpl.c:26
-#: plugins/admin/departments/domain.tpl.c:20
-msgid "Manager"
+#: plugins/personal/generic/class_user.inc:193
+msgid "Short description of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1398
-msgid "Employee number"
+#: plugins/personal/generic/class_user.inc:197
+msgid "Picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1399
-#: plugins/personal/generic/generic.tpl.c:92
-msgid "Employee type"
-msgstr "员工类别"
+#: plugins/personal/generic/class_user.inc:197
+msgid "The avatar for this user"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1401
-msgid "Room number"
+#: plugins/personal/generic/class_user.inc:204
+msgid "Account information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1402
-msgid "Telefon number"
+#: plugins/personal/generic/class_user.inc:209
+msgid "Login of this user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1403
-msgid "Pager number"
+#: plugins/personal/generic/class_user.inc:213
+msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1404
-msgid "Mobile number"
+#: plugins/personal/generic/class_user.inc:218
+msgid "Password of the user"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1405
-msgid "Fax number"
+#: plugins/personal/generic/class_user.inc:223
+msgid "Restrict FD login to"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1407
-#: plugins/admin/departments/class_organizationGeneric.inc:128
-#: plugins/admin/departments/class_department.inc:665
-#: plugins/personal/generic/generic.tpl.c:116
-#: plugins/admin/departments/organization.tpl.c:32
-#: plugins/admin/departments/generic.tpl.c:32
-msgid "State"
-msgstr "州/省"
+#: plugins/personal/generic/class_user.inc:223
+msgid ""
+"The user will only be able to connect to FusionDirectory from these hosts or"
+" networks"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1408
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:666
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/personal/generic/generic.tpl.c:113
+#: plugins/personal/generic/class_user.inc:230
+msgid "Contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:234
+#: plugins/admin/departments/class_organizationGeneric.inc:133
+#: plugins/admin/departments/class_department.inc:486
+#: plugins/admin/departments/class_localityGeneric.inc:94
 #: plugins/admin/departments/organization.tpl.c:29
 #: plugins/admin/departments/organization.tpl.c:38
 #: plugins/admin/departments/generic.tpl.c:29
@@ -2332,306 +2031,439 @@ msgstr "州/省"
 msgid "Location"
 msgstr "位置"
 
-#: plugins/personal/generic/class_user.inc:1409
-#: plugins/admin/departments/class_organizationGeneric.inc:130
-msgid "Postal address"
-msgstr "地址"
+#: plugins/personal/generic/class_user.inc:238
+#: plugins/admin/departments/class_organizationGeneric.inc:132
+#: plugins/admin/departments/class_department.inc:485
+#: plugins/admin/departments/organization.tpl.c:32
+#: plugins/admin/departments/generic.tpl.c:32
+msgid "State"
+msgstr "州/省"
 
-#: plugins/personal/generic/class_user.inc:1411
-msgid "Home postal address"
-msgstr "住宅地址"
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/admin/departments/class_department.inc:487
+#: plugins/admin/departments/organization.tpl.c:44
+#: plugins/admin/departments/generic.tpl.c:44
+msgid "Address"
+msgstr "住址"
 
-#: plugins/personal/generic/class_user.inc:1412
-msgid "Home phone number"
+#: plugins/personal/generic/class_user.inc:242
+msgid "Business postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1414
-msgid "User password method"
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room No."
+msgstr "房间号"
+
+#: plugins/personal/generic/class_user.inc:246
+msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1434
-msgid "Entries differ"
+#: plugins/personal/generic/class_user.inc:250
+msgid "Business phone number"
 msgstr ""
 
-#: plugins/personal/posix/groupSelect/group-list.xml:11
-#: plugins/personal/posix/trustSelect/trust-list.xml:10
-#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
-#: plugins/admin/groups/userSelect/user-list.xml:10
-#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
-msgid "Please select the desired entries"
+#: plugins/personal/generic/class_user.inc:254
+msgid "Mobile"
+msgstr "手机"
+
+#: plugins/personal/generic/class_user.inc:254
+msgid "Business mobile number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
-msgid "Winstation"
-msgstr "Windows 工作站"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Pager"
+msgstr "呼机"
 
-#: plugins/personal/posix/trustSelect/trust-list.xml:38
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
-#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
-msgid "Terminal"
-msgstr "终端"
+#: plugins/personal/generic/class_user.inc:258
+msgid "Business pager number"
+msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:57
-#: plugins/admin/groups/class_groupManagement.inc:101
-msgid "Posix"
-msgstr "Posix"
+#: plugins/personal/generic/class_user.inc:262
+#: plugins/admin/departments/class_organizationGeneric.inc:136
+#: plugins/admin/departments/class_department.inc:333
+#: plugins/admin/departments/class_department.inc:489
+#: plugins/admin/departments/organization.tpl.c:56
+#: plugins/admin/departments/generic.tpl.c:56
+msgid "Fax"
+msgstr "传真"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:58
-#: plugins/admin/groups/class_groupManagement.inc:102
-msgid "Edit posix properties"
+#: plugins/personal/generic/class_user.inc:262
+msgid "Business fax number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:66
-#: plugins/admin/groups/class_groupManagement.inc:110
-msgid "Edit mail properties"
-msgstr "编辑邮件属性"
+#: plugins/personal/generic/class_user.inc:268
+msgid "Organizational information"
+msgstr "组织信息"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:74
-#: plugins/admin/groups/class_groupManagement.inc:118
-msgid "Edit samba properties"
-msgstr "编辑 samba 属性"
+#: plugins/personal/generic/class_user.inc:272
+#: plugins/admin/departments/class_organizationGeneric.inc:114
+#: plugins/admin/departments/class_organizationGeneric.inc:115
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/dep-list.xml:47
+#: plugins/admin/departments/dep-list.xml:131
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: setup/setup_feedback.tpl.c:8
+msgid "Organization"
+msgstr "组织/公司"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:82
-#: plugins/admin/groups/class_groupManagement.inc:126
-msgid "Edit phone properties"
-msgstr "编辑电话属性"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department No."
+msgstr "部门编号"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:133
-msgid "Menu"
+#: plugins/personal/generic/class_user.inc:280
+msgid "Department number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:90
-#: plugins/admin/groups/class_groupManagement.inc:134
-msgid "Edit start menu properties"
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee No."
+msgstr "员工编号"
+
+#: plugins/personal/generic/class_user.inc:284
+msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:97
-#: plugins/admin/groups/class_groupManagement.inc:141
-#: plugins/admin/ogroups/tabs_ogroups.inc:137
-msgid "Environment"
-msgstr "环境设置"
+#: plugins/personal/generic/class_user.inc:288
+msgid "Employee type"
+msgstr "员工类别"
 
-#: plugins/personal/posix/trustSelect/class_trustSelect.inc:98
-#: plugins/admin/groups/class_groupManagement.inc:142
-msgid "Edit environment properties"
-msgstr "编辑环境属性"
+#: plugins/personal/generic/class_user.inc:292
+#: plugins/admin/departments/class_organizationGeneric.inc:130
+#: plugins/admin/departments/class_dcObject.inc:95
+#: plugins/admin/departments/class_department.inc:490
+#: plugins/admin/departments/class_domain.inc:97
+#: plugins/admin/departments/class_countryGeneric.inc:95
+#: plugins/admin/departments/class_localityGeneric.inc:96
+#: plugins/admin/departments/dcObject.tpl.c:20
+#: plugins/admin/departments/locality.tpl.c:20
+#: plugins/admin/departments/country.tpl.c:20
+#: plugins/admin/departments/organization.tpl.c:26
+#: plugins/admin/departments/generic.tpl.c:26
+#: plugins/admin/departments/domain.tpl.c:20
+msgid "Manager"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:298
+msgid "Personal contact information"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:302
+msgid "Home postal address"
+msgstr "住宅地址"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Private phone"
+msgstr "私人电话"
+
+#: plugins/personal/generic/class_user.inc:306
+msgid "Home phone number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Homepage"
+msgstr "个人主页"
+
+#: plugins/personal/generic/class_user.inc:310
+msgid "Personal homepage"
+msgstr ""
+
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:10
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: plugins/admin/departments/class_organizationGeneric.inc:79
+#: plugins/admin/departments/class_organizationGeneric.inc:81
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_organizationGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:47
+#: plugins/admin/departments/class_dcObject.inc:49
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:56
+#: plugins/admin/departments/class_dcObject.inc:58
+#: plugins/admin/departments/class_dcObject.inc:93
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:311
+#: plugins/admin/departments/class_department.inc:316
+#: plugins/admin/departments/class_department.inc:323
+#: plugins/admin/departments/class_department.inc:327
+#: plugins/admin/departments/class_domain.inc:47
+#: plugins/admin/departments/class_domain.inc:49
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:56
+#: plugins/admin/departments/class_domain.inc:58
+#: plugins/admin/departments/class_domain.inc:94
+#: plugins/admin/departments/class_countryGeneric.inc:47
+#: plugins/admin/departments/class_countryGeneric.inc:49
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_countryGeneric.inc:56
+#: plugins/admin/departments/class_countryGeneric.inc:58
+#: plugins/admin/departments/class_localityGeneric.inc:48
+#: plugins/admin/departments/class_localityGeneric.inc:50
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_localityGeneric.inc:57
+#: plugins/admin/departments/class_localityGeneric.inc:59
+#: plugins/admin/users/class_userManagement.inc:497
+#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/groups/class_group.inc:1016
+#: plugins/admin/groups/class_group.inc:1027
+#: plugins/admin/groups/class_group.inc:1029
+#: plugins/admin/groups/class_group.inc:1046
+#: plugins/admin/groups/class_group.inc:1060
+#: plugins/admin/groups/class_group.inc:1067
+#: plugins/admin/groups/class_group.inc:1116
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/group-list.xml:58
+#: plugins/admin/acl/class_aclRole.inc:650
+#: plugins/admin/acl/class_aclRole.inc:663
+#: plugins/admin/acl/class_aclRole.inc:673 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:112
+#: plugins/admin/ogroups/class_ogroup.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:752
+#: plugins/admin/ogroups/class_ogroup.inc:756
+#: plugins/admin/ogroups/class_ogroup.inc:906
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:64
+#: include/simpleplugin/simple-list.xml:32
+#: ihtml/themes/default/simple-filter.tpl.c:5 setup/setup_migrate.tpl.c:116
+#: setup/setup_feedback.tpl.c:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl.c:14
+#: plugins/admin/departments/dep-filter.tpl.c:5
+#: plugins/admin/users/user-filter.tpl.c:20
+#: plugins/admin/groups/group-filter.tpl.c:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl.c:11
+#: plugins/admin/groups/userSelect/user-filter.tpl.c:5
+#: plugins/admin/groups/singleUserSelect/singleUser-filter.tpl.c:5
+#: plugins/admin/acl/acl-filter.tpl.c:11 plugins/admin/acl/acl_role.tpl.c:5
+#: plugins/admin/acl/paste_role.tpl.c:2
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:35
+#: plugins/admin/ogroups/ogroup-filter.tpl.c:35
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:17
+msgid "Name"
+msgstr "名称"
+
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: plugins/personal/posix/class_posixAccount.inc:96
+#: plugins/personal/posix/class_posixAccount.inc:82
 msgid "The path to the home directory of this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:101
+#: plugins/personal/posix/class_posixAccount.inc:87
 msgid "Which shell should be used when this user log in"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group"
 msgstr "主要用户组"
 
-#: plugins/personal/posix/class_posixAccount.inc:105
+#: plugins/personal/posix/class_posixAccount.inc:91
 msgid "Primary group for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status"
 msgstr "状态"
 
-#: plugins/personal/posix/class_posixAccount.inc:109
+#: plugins/personal/posix/class_posixAccount.inc:95
 msgid "Status of this user unix account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID/GID"
 msgstr "指定 UID/GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:113
+#: plugins/personal/posix/class_posixAccount.inc:99
 msgid "Force UID and GID values for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:117
-#: plugins/personal/posix/class_posixAccount.inc:372
+#: plugins/personal/posix/class_posixAccount.inc:103
+#: plugins/personal/posix/class_posixAccount.inc:359
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:117
+#: plugins/personal/posix/class_posixAccount.inc:103
 msgid "UID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:122
-#: plugins/personal/posix/class_posixAccount.inc:375
+#: plugins/personal/posix/class_posixAccount.inc:108
+#: plugins/personal/posix/class_posixAccount.inc:362
 #: plugins/admin/groups/class_group.inc:1076
 #: plugins/admin/groups/class_group.inc:1079
-#: plugins/admin/groups/class_group.inc:1117
+#: plugins/admin/groups/class_group.inc:1120
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/class_posixAccount.inc:122
+#: plugins/personal/posix/class_posixAccount.inc:108
 msgid "GID value for this user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:129
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:115
+#: plugins/personal/posix/class_posixAccount.inc:118
 msgid "Group membership"
 msgstr "组成员身份"
 
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:122
 msgid "Account"
 msgstr "账户"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login"
 msgstr "用户必须在第一次登录修改口令"
 
-#: plugins/personal/posix/class_posixAccount.inc:140
+#: plugins/personal/posix/class_posixAccount.inc:126
 msgid "User must change password on first login (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid "Delay before locking password (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:144
+#: plugins/personal/posix/class_posixAccount.inc:130
 msgid ""
 "The user won't be able to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid "Delay before forcing password change (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:135
 msgid ""
 "The user will be forced to change his password after this number of days "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "Password expiration date"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:154
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid ""
 "Date after which this user password will expire (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid "Delay of inactivity before disabling user (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:159
+#: plugins/personal/posix/class_posixAccount.inc:145
 msgid ""
 "Maximum delay of inactivity after password expiration before the user is "
 "disabled (leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid "Delay for user warning before password expiry (days)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:164
+#: plugins/personal/posix/class_posixAccount.inc:150
 msgid ""
 "The user will be warned this number of days before his password expiration "
 "(leave empty to disable)"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:176
-#: plugins/admin/groups/class_group.inc:1121
-#: plugins/admin/ogroups/class_ogroup.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:162
+#: plugins/admin/groups/class_group.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:909
 #: plugins/admin/ogroups/generic.tpl.c:17
 msgid "System trust"
 msgstr "信赖的系统"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 #: plugins/admin/groups/generic.tpl.c:38
 #: plugins/admin/ogroups/generic.tpl.c:20
 msgid "Trust mode"
 msgstr "信赖模式"
 
-#: plugins/personal/posix/class_posixAccount.inc:180
+#: plugins/personal/posix/class_posixAccount.inc:166
 msgid "Type of authorization for those hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "disabled"
 msgstr "禁用"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:446
 #: plugins/admin/ogroups/class_ogroup.inc:392
 msgid "full access"
 msgstr "完全访问权限"
 
-#: plugins/personal/posix/class_posixAccount.inc:184
-#: plugins/admin/groups/class_group.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:170
+#: plugins/admin/groups/class_group.inc:447
 #: plugins/admin/ogroups/class_ogroup.inc:393
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: plugins/personal/posix/class_posixAccount.inc:187
+#: plugins/personal/posix/class_posixAccount.inc:173
 msgid "Only allow this user to connect to this list of hosts"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:198
+#: plugins/personal/posix/class_posixAccount.inc:184
 msgid "Unix"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:199
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "Edit users POSIX settings"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:275
-#: include/class_management.inc:41 include/class_management.inc:42
+#: plugins/personal/posix/class_posixAccount.inc:261
+#: include/class_management.inc:40 include/class_management.inc:41
 msgid "unconfigured"
 msgstr "未配置"
 
-#: plugins/personal/posix/class_posixAccount.inc:287
+#: plugins/personal/posix/class_posixAccount.inc:273
 msgid "automatic"
 msgstr "自动"
 
-#: plugins/personal/posix/class_posixAccount.inc:305
+#: plugins/personal/posix/class_posixAccount.inc:291
 msgid "expired"
 msgstr "过期"
 
-#: plugins/personal/posix/class_posixAccount.inc:307
+#: plugins/personal/posix/class_posixAccount.inc:293
 msgid "grace time active"
 msgstr "时间限制激活"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
-#: plugins/personal/posix/class_posixAccount.inc:312
-#: plugins/personal/posix/class_posixAccount.inc:314
+#: plugins/personal/posix/class_posixAccount.inc:296
+#: plugins/personal/posix/class_posixAccount.inc:298
+#: plugins/personal/posix/class_posixAccount.inc:300
 msgid "active"
 msgstr "活动"
 
-#: plugins/personal/posix/class_posixAccount.inc:310
+#: plugins/personal/posix/class_posixAccount.inc:296
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:312
+#: plugins/personal/posix/class_posixAccount.inc:298
 msgid "password not changeable"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:430
+#: plugins/personal/posix/class_posixAccount.inc:417
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:488
-#: include/simpleplugin/class_dialogAttributes.inc:371
-msgid "Group of user"
-msgstr "用户组"
+#: plugins/personal/posix/class_posixAccount.inc:477
+#, php-format
+msgid "Group of user %s"
+msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:35
 msgid "Password recovery"
@@ -2750,8 +2582,8 @@ msgstr ""
 #: plugins/admin/password/class_recoveryConfig.inc:122
 #, php-format
 msgid ""
-"Body of the second email, sent to confirm the password has been changed. Use "
-"%s for the user login."
+"Body of the second email, sent to confirm the password has been changed. Use"
+" %s for the user login."
 msgstr ""
 
 #: plugins/admin/password/class_recoveryConfig.inc:125
@@ -2763,120 +2595,105 @@ msgid ""
 "Your login is still %s."
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_organizationGeneric.inc:125
 msgid "Organization name"
 msgstr ""
 
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/class_department.inc:482
 #: plugins/admin/departments/organization.tpl.c:17
 #: plugins/admin/departments/generic.tpl.c:17
 msgid "Category"
 msgstr "分类"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:131
-msgid "Phone number"
-msgstr "电话号码"
+#: plugins/admin/departments/class_organizationGeneric.inc:128
+#: plugins/admin/departments/class_dcObject.inc:96
+#: plugins/admin/departments/class_department.inc:483
+#: plugins/admin/departments/class_domain.inc:96
+#: plugins/admin/departments/class_countryGeneric.inc:96
+#: plugins/admin/departments/class_localityGeneric.inc:97
+#: plugins/admin/groups/class_group.inc:1118
+#: plugins/admin/acl/class_aclRole.inc:651
+#: plugins/admin/ogroups/class_ogroup.inc:907
+#: include/simpleplugin/class_attribute.inc:1391
+#: ihtml/themes/default/simple-list.tpl.c:2 setup/setup_ldap.tpl.c:26
+#: plugins/admin/departments/dcObject.tpl.c:17
+#: plugins/admin/departments/locality.tpl.c:17
+#: plugins/admin/departments/country.tpl.c:17
+#: plugins/admin/departments/organization.tpl.c:23
+#: plugins/admin/departments/generic.tpl.c:23
+#: plugins/admin/departments/domain.tpl.c:17
+#: plugins/admin/groups/generic.tpl.c:14 plugins/admin/acl/acl_role.tpl.c:11
+#: plugins/admin/ogroups/generic.tpl.c:14
+msgid "Base"
+msgstr "位置"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:134
-#: plugins/admin/departments/class_dcObject.inc:93
-#: plugins/admin/departments/class_department.inc:672
-#: plugins/admin/departments/class_domain.inc:94
-#: plugins/admin/departments/class_countryGeneric.inc:93
-#: plugins/admin/departments/class_localityGeneric.inc:94
-#: plugins/admin/departments/dcObject.tpl.c:23
-#: plugins/admin/departments/locality.tpl.c:23
-#: plugins/admin/departments/country.tpl.c:23
-#: plugins/admin/departments/organization.tpl.c:62
-#: plugins/admin/departments/generic.tpl.c:62
-#: plugins/admin/departments/domain.tpl.c:23
-msgid "Administrative settings"
-msgstr "管理设置"
+msgid "Postal address"
+msgstr "地址"
+
+#: plugins/admin/departments/class_organizationGeneric.inc:135
+msgid "Phone number"
+msgstr "电话号码"
 
 #: plugins/admin/departments/class_dcObject.inc:82
 #: plugins/admin/departments/class_dcObject.inc:83
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:207
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:199
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:431
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_department.inc:500
-#, php-format
-msgid "Tagging '%s'."
-msgstr "标记 '%s'。"
-
-#: plugins/admin/departments/class_department.inc:557
-#: plugins/admin/departments/class_department.inc:639
-#: ihtml/themes/default/snapshotdialog.tpl.c:44
-#: plugins/admin/users/template.tpl.c:20
-msgid "Continue"
-msgstr "ç»§ç»­"
+#: plugins/admin/departments/class_department.inc:127
+#: include/simpleplugin/class_dialogAttributes.inc:581
+#: include/class_pluglist.inc:317 include/class_pluglist.inc:318
+#: include/class_pluglist.inc:387
+msgid "Unknown"
+msgstr "未知"
 
-#: plugins/admin/departments/class_department.inc:581
+#: plugins/admin/departments/class_department.inc:401
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "移动 '%s' 到 '%s'"
 
-#: plugins/admin/departments/class_department.inc:617
-#: include/class_msgPool.inc:708 include/class_acl.inc:798
-#: include/class_acl.inc:805 include/class_acl.inc:812
-#: include/class_acl.inc:818 ihtml/themes/default/snapshotdialog.tpl.c:14
+#: plugins/admin/departments/class_department.inc:437
+#: include/class_msgPool.inc:716 include/class_acl.inc:763
+#: include/class_acl.inc:770 include/class_acl.inc:777
+#: include/class_acl.inc:783 ihtml/themes/default/snapshotdialog.tpl.c:14
 #: ihtml/themes/default/snapshotdialog.tpl.c:35
 msgid "Object"
 msgstr "对象"
 
-#: plugins/admin/departments/class_department.inc:622
+#: plugins/admin/departments/class_department.inc:442
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "拷贝 %s 失败,退出操作"
 
-#: plugins/admin/departments/class_department.inc:654
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/departments/class_department.inc:459
+#: ihtml/themes/default/snapshotdialog.tpl.c:44
+#: plugins/admin/users/template.tpl.c:20
+msgid "Continue"
+msgstr "ç»§ç»­"
+
+#: plugins/admin/departments/class_department.inc:474
+#: plugins/admin/departments/class_department.inc:476
 #: plugins/admin/departments/class_departmentManagement.inc:36
 msgid "Departments"
 msgstr "部门"
 
-#: plugins/admin/departments/class_department.inc:660
+#: plugins/admin/departments/class_department.inc:480
 msgid "Department name"
 msgstr "部门名称"
 
-#: plugins/admin/departments/class_department.inc:667
-#: plugins/personal/generic/generic.tpl.c:53
-#: plugins/personal/generic/generic.tpl.c:119
-#: plugins/admin/departments/organization.tpl.c:44
-#: plugins/admin/departments/generic.tpl.c:44
-msgid "Address"
-msgstr "住址"
-
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:488
 msgid "Telephone"
 msgstr "电话"
 
-#: plugins/admin/departments/class_department.inc:724
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "对象 '%s' 已经做标记"
-
-#: plugins/admin/departments/class_department.inc:731
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "添加标识(%s)到对象 '%s'"
-
-#: plugins/admin/departments/class_department.inc:763
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "从对象 '%s' 删除标记"
-
 #: plugins/admin/departments/class_domain.inc:82
 #: plugins/admin/departments/class_domain.inc:83
-#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_domain.inc:89
 #: plugins/admin/departments/dep-list.xml:15
 #: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:195
+#: plugins/admin/departments/class_departmentManagement.inc:187
 msgid "Domain"
 msgstr "域"
 
@@ -2893,8 +2710,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:117
 #: plugins/admin/departments/class_countryGeneric.inc:82
 #: plugins/admin/departments/class_countryGeneric.inc:83
-#: plugins/admin/departments/class_countryGeneric.inc:86
-#: plugins/admin/departments/class_departmentManagement.inc:219
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_departmentManagement.inc:211
 msgid "Country"
 msgstr "国家"
 
@@ -2902,8 +2719,8 @@ msgstr "国家"
 #: plugins/admin/departments/dep-list.xml:124
 #: plugins/admin/departments/class_localityGeneric.inc:83
 #: plugins/admin/departments/class_localityGeneric.inc:84
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_departmentManagement.inc:231
+#: plugins/admin/departments/class_localityGeneric.inc:89
+#: plugins/admin/departments/class_departmentManagement.inc:223
 msgid "Locality"
 msgstr ""
 
@@ -2911,24 +2728,26 @@ msgstr ""
 #: plugins/admin/users/user-list.xml:78 plugins/admin/groups/group-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:64
 #: plugins/admin/acl/acl-list.xml:65 plugins/admin/ogroups/ogroup-list.xml:62
-#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1217
+#: include/simpleplugin/simple-list.xml:48 include/class_listing.inc:1226
 msgid "Actions"
 msgstr "动作"
 
 #: plugins/admin/departments/dep-list.xml:172
 #: plugins/admin/users/user-list.xml:114
 #: plugins/admin/groups/group-list.xml:108
-#: plugins/admin/acl/class_aclRole.inc:377
-#: plugins/admin/acl/class_aclRole.inc:426 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/acl/class_aclRole.inc:321
+#: plugins/admin/acl/class_aclRole.inc:370 plugins/admin/acl/acl-list.xml:131
 #: plugins/admin/ogroups/ogroup-list.xml:91
-#: include/class_sortableListing.inc:306 include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:308 include/class_sortableListing.inc:310
+#: include/simpleplugin/class_dialogAttributes.inc:586
 #: include/simpleplugin/simple-list.xml:66
-#: include/simpleplugin/simple-list.xml:109 include/class_acl.inc:511
-#: include/class_acl.inc:559
+#: include/simpleplugin/simple-list.xml:109
+#: include/simpleplugin/class_attribute.inc:2082 include/class_acl.inc:477
+#: include/class_acl.inc:524
 msgid "Edit"
 msgstr "编辑"
 
-#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_countryGeneric.inc:93
 #: plugins/admin/departments/country.tpl.c:5
 msgid "Country name"
 msgstr ""
@@ -2946,11 +2765,24 @@ msgid "List of users"
 msgstr "用户列表"
 
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:494
 #: plugins/admin/users/templatize.tpl.c:8 plugins/admin/users/template.tpl.c:8
 msgid "Template"
 msgstr "模板"
 
+#: plugins/admin/users/user-list.xml:49
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
+msgid "Surname"
+msgstr "å§“"
+
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/users/class_userManagement.inc:500
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
+msgid "Given name"
+msgstr "名"
+
 #: plugins/admin/users/user-list.xml:73 plugins/admin/groups/group-list.xml:74
 #: plugins/admin/ogroups/ogroup-list.xml:57
 #: plugins/admin/departments/dcObject.tpl.c:2
@@ -2962,7 +2794,7 @@ msgstr "模板"
 msgid "Properties"
 msgstr "属性"
 
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:224
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:223
 #: ihtml/themes/default/accountexpired.tpl.c:23
 msgid "Change password"
 msgstr "修改口令"
@@ -2983,15 +2815,15 @@ msgstr ""
 msgid "New user from template"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:205
 msgid "Edit user"
 msgstr "编辑用户"
 
-#: plugins/admin/users/user-list.xml:215
+#: plugins/admin/users/user-list.xml:214
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:239
+#: plugins/admin/users/user-list.xml:237
 msgid "Remove user"
 msgstr ""
 
@@ -2999,56 +2831,56 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:202
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:203
+#: plugins/admin/users/class_userManagement.inc:725
 #: include/simpleplugin/class_simpleManagement.inc:228
 #: include/simpleplugin/class_simpleManagement.inc:294
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:333 include/class_management.inc:483
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590 include/class_CopyPasteHandler.inc:223
+#: include/class_management.inc:335 include/class_management.inc:487
+#: include/class_management.inc:542 include/class_management.inc:587
+#: include/class_CopyPasteHandler.inc:225
 msgid "Permission"
-msgstr ""
+msgstr "允许"
 
 #: plugins/admin/users/class_userManagement.inc:391
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:467
-#: plugins/admin/users/class_userManagement.inc:501
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:421
+#: plugins/admin/users/class_userManagement.inc:456
+#: plugins/admin/users/class_userManagement.inc:487
 msgid "none"
 msgstr "æ— "
 
-#: plugins/admin/users/class_userManagement.inc:716
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/acl/class_aclManagement.inc:101
-#: include/class_management.inc:403
+#: include/class_management.inc:406
 msgid "Permission error"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:796
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:797
+#: plugins/admin/users/class_userManagement.inc:764
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:837
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:872
+#: plugins/admin/users/class_userManagement.inc:839
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:900
+#: plugins/admin/users/class_userManagement.inc:867
 msgid "Generic properties"
 msgstr ""
 
@@ -3056,52 +2888,52 @@ msgstr ""
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Samba group"
 msgstr "Samba 组"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain admins"
 msgstr "域管理员"
 
-#: plugins/admin/groups/class_group.inc:411
+#: plugins/admin/groups/class_group.inc:413
 msgid "Domain users"
 msgstr "域用户"
 
-#: plugins/admin/groups/class_group.inc:412
+#: plugins/admin/groups/class_group.inc:414
 msgid "Domain guests"
 msgstr "域名 guests"
 
-#: plugins/admin/groups/class_group.inc:417
+#: plugins/admin/groups/class_group.inc:419
 #, php-format
 msgid "Special group (%d)"
 msgstr "特殊组 (%d)"
 
-#: plugins/admin/groups/class_group.inc:522
+#: plugins/admin/groups/class_group.inc:524
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:528
+#: plugins/admin/groups/class_group.inc:530
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:595
+#: plugins/admin/groups/class_group.inc:597
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:638
+#: plugins/admin/groups/class_group.inc:640
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:865
+#: plugins/admin/groups/class_group.inc:867
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:870
+#: plugins/admin/groups/class_group.inc:872
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
@@ -3115,23 +2947,23 @@ msgstr ""
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1119
+#: plugins/admin/groups/class_group.inc:1122
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1120
+#: plugins/admin/groups/class_group.inc:1123
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1122
+#: plugins/admin/groups/class_group.inc:1125
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1123
+#: plugins/admin/groups/class_group.inc:1126
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_group.inc:1125
+#: plugins/admin/groups/class_group.inc:1128
 msgid "Group member"
 msgstr ""
 
@@ -3155,9 +2987,55 @@ msgstr ""
 msgid "Remove group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:37
-msgid "Manage groups"
-msgstr ""
+#: plugins/admin/groups/class_groupManagement.inc:37
+msgid "Manage groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:101
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:59
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:102
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:60
+msgid "Edit posix properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:110
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:68
+msgid "Edit mail properties"
+msgstr "编辑邮件属性"
+
+#: plugins/admin/groups/class_groupManagement.inc:118
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:76
+msgid "Edit samba properties"
+msgstr "编辑 samba 属性"
+
+#: plugins/admin/groups/class_groupManagement.inc:126
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:84
+msgid "Edit phone properties"
+msgstr "编辑电话属性"
+
+#: plugins/admin/groups/class_groupManagement.inc:133
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:91
+msgid "Menu"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:134
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:92
+msgid "Edit start menu properties"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:141
+#: plugins/admin/ogroups/tabs_ogroups.inc:170
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:99
+msgid "Environment"
+msgstr "环境设置"
+
+#: plugins/admin/groups/class_groupManagement.inc:142
+#: include/simpleplugin/systemSelect/class_systemSelect.inc:100
+msgid "Edit environment properties"
+msgstr "编辑环境属性"
 
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:79
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:85
@@ -3165,111 +3043,107 @@ msgstr ""
 msgid "Select user"
 msgstr ""
 
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:378
-#: plugins/admin/acl/class_aclRole.inc:382
-#: plugins/admin/acl/class_aclRole.inc:732 include/class_tabs.inc:397
-#: include/class_acl.inc:511 include/class_acl.inc:515
-#: include/class_acl.inc:1344 include/class_acl.inc:1347
-#: include/class_acl.inc:1349
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:322
+#: plugins/admin/acl/class_aclRole.inc:326
+#: plugins/admin/acl/class_aclRole.inc:680 include/class_tabs.inc:393
+#: include/class_acl.inc:477 include/class_acl.inc:481
+#: include/class_acl.inc:1309 include/class_acl.inc:1312
+#: include/class_acl.inc:1314
 msgid "ACL"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:696
-msgid "Access control roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:27
-msgid "Edit AC roles"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:127 include/class_acl.inc:220
-msgid "All categories"
-msgstr ""
-
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:76
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:135 include/class_acl.inc:229
+#: plugins/admin/acl/class_aclRole.inc:77 include/class_acl.inc:193
 msgid "One level"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:136 include/class_acl.inc:230
-#: include/class_acl.inc:235
+#: plugins/admin/acl/class_aclRole.inc:78 include/class_acl.inc:194
+#: include/class_acl.inc:199
 msgid "Current object"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:137 include/class_acl.inc:231
+#: plugins/admin/acl/class_aclRole.inc:79 include/class_acl.inc:195
 msgid "Complete subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:138 include/class_acl.inc:232
+#: plugins/admin/acl/class_aclRole.inc:80 include/class_acl.inc:196
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:372
-#: include/class_sortableListing.inc:343 include/class_acl.inc:504
-#: include/class_listing.inc:290 include/class_listing.inc:1105
-#: include/class_listing.inc:1107
+#: plugins/admin/acl/class_aclRole.inc:316
+#: include/class_sortableListing.inc:345 include/class_acl.inc:470
+#: include/class_listing.inc:289 include/class_listing.inc:1114
+#: include/class_listing.inc:1116
 msgid "Up"
 msgstr "上"
 
-#: plugins/admin/acl/class_aclRole.inc:374
-#: include/class_sortableListing.inc:343 include/class_acl.inc:506
-#: include/class_listing.inc:290
+#: plugins/admin/acl/class_aclRole.inc:318
+#: include/class_sortableListing.inc:345 include/class_acl.inc:472
+#: include/class_listing.inc:289
 msgid "Down"
 msgstr "关闭"
 
-#: plugins/admin/acl/class_aclRole.inc:381
-#: plugins/admin/acl/class_aclRole.inc:430
-#: include/class_sortableListing.inc:311 include/class_sortableListing.inc:313
-#: include/class_msgPool.inc:505 include/class_acl.inc:515
-#: include/class_acl.inc:563
+#: plugins/admin/acl/class_aclRole.inc:325
+#: plugins/admin/acl/class_aclRole.inc:374
+#: include/class_sortableListing.inc:313 include/class_sortableListing.inc:315
+#: include/simpleplugin/class_attribute.inc:2084 include/class_msgPool.inc:513
+#: include/class_acl.inc:481 include/class_acl.inc:528
 #, php-format
 msgid "Delete"
 msgstr "删除"
 
-#: plugins/admin/acl/class_aclRole.inc:418
+#: plugins/admin/acl/class_aclRole.inc:362
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:420
+#: plugins/admin/acl/class_aclRole.inc:364
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:426
+#: plugins/admin/acl/class_aclRole.inc:370
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:430
+#: plugins/admin/acl/class_aclRole.inc:374
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:394
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:460 include/class_acl.inc:625
+#: plugins/admin/acl/class_aclRole.inc:404 include/class_acl.inc:590
 msgid "All objects in current subtree"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:646
+#: plugins/admin/acl/class_aclRole.inc:590
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:699
+#: plugins/admin/acl/class_aclRole.inc:639 plugins/admin/acl/acl-list.xml:23
+#: plugins/admin/acl/acl-list.xml:82
+msgid "Role"
+msgstr "角色"
+
+#: plugins/admin/acl/class_aclRole.inc:640
+msgid "Access control roles"
+msgstr ""
+
+#: plugins/admin/acl/class_aclRole.inc:645
 msgid "ACL role"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:705
+#: plugins/admin/acl/class_aclRole.inc:653
 msgid "Permissions"
 msgstr "允许"
 
@@ -3277,10 +3151,10 @@ msgstr "允许"
 msgid "List of acls"
 msgstr ""
 
-#: plugins/admin/acl/acl-list.xml:15 plugins/admin/acl/acl-list.xml:82
+#: plugins/admin/acl/acl-list.xml:15
 #: plugins/admin/acl/class_aclManagement.inc:36
 msgid "Acl"
-msgstr ""
+msgstr "ACL"
 
 #: plugins/admin/acl/class_aclManagement.inc:37
 msgid "Access control list management"
@@ -3295,7 +3169,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:36
-#: plugins/admin/ogroups/class_ogroup.inc:899
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "Object groups"
 msgstr "对象组"
 
@@ -3315,51 +3189,62 @@ msgstr "模板"
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:85
-msgid "Phone queue"
-msgstr "电话队列"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:38
+msgid "Terminal"
+msgstr "终端"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:156
-msgid "Applications"
-msgstr "应用程序"
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: include/simpleplugin/systemSelect/systemSelect-list.xml:30
+msgid "Winstation"
+msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:226
-#: plugins/admin/ogroups/tabs_ogroups.inc:233
+#: plugins/admin/ogroups/tabs_ogroups.inc:38
+#: plugins/admin/ogroups/tabs_ogroups.inc:45
 msgid "Devices"
 msgstr "设备"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:227
+#: plugins/admin/ogroups/tabs_ogroups.inc:39
 msgid "Startup"
 msgstr "启动"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:230
+#: plugins/admin/ogroups/tabs_ogroups.inc:42
 msgid "Systems"
 msgstr "系统设置"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:236
+#: plugins/admin/ogroups/tabs_ogroups.inc:48
 msgid "Workstartup"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:237
+#: plugins/admin/ogroups/tabs_ogroups.inc:49
 msgid "Debconf"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:238
+#: plugins/admin/ogroups/tabs_ogroups.inc:50
 msgid "FAI"
 msgstr "自动化安装"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:239
+#: plugins/admin/ogroups/tabs_ogroups.inc:51
 msgid "FAI summary"
 msgstr "自动化安装说明"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:240
+#: plugins/admin/ogroups/tabs_ogroups.inc:52
 msgid "Argonaut client"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:243
+#: plugins/admin/ogroups/tabs_ogroups.inc:55
 msgid "OPSI"
 msgstr ""
 
+#: plugins/admin/ogroups/tabs_ogroups.inc:118
+msgid "Phone queue"
+msgstr "电话队列"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:189
+msgid "Applications"
+msgstr "应用程序"
+
 #: plugins/admin/ogroups/class_ogroup.inc:209
 #, php-format
 msgid ""
@@ -3389,7 +3274,7 @@ msgstr ""
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:909
+#: plugins/admin/ogroups/class_ogroup.inc:910
 msgid "Member"
 msgstr ""
 
@@ -3420,36 +3305,32 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:279
+#: include/class_tabs.inc:291
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "删除进程被插件 '%s' 取消: %s"
 
-#: include/class_tabs.inc:402
+#: include/class_tabs.inc:398
 msgid "References"
 msgstr "参考"
 
-#: include/class_sortableListing.inc:303
-msgid "Sortable list"
-msgstr ""
-
-#: include/class_sortableListing.inc:308
+#: include/class_sortableListing.inc:310
 msgid "Edit this entry"
 msgstr "编辑这条记录"
 
-#: include/class_sortableListing.inc:313
+#: include/class_sortableListing.inc:315
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
-#: include/class_xml.inc:65
+#: include/class_xml.inc:66
 msgid "in"
-msgstr ""
+msgstr "于"
 
-#: include/class_xml.inc:67
+#: include/class_xml.inc:68
 msgid "on line"
 msgstr ""
 
-#: include/class_xml.inc:68
+#: include/class_xml.inc:69
 msgid "XML error"
 msgstr ""
 
@@ -3493,29 +3374,29 @@ msgstr "类型"
 msgid "Arguments"
 msgstr "参数"
 
-#: include/php_setup.inc:206
+#: include/php_setup.inc:207
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr "生成这个页面导致 PHP 解析器发生一些错误!"
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:212
 msgid "Send bug report to the FusionDirectory Team"
 msgstr ""
 
-#: include/php_setup.inc:211
+#: include/php_setup.inc:213
 msgid "Send bugreport"
 msgstr ""
 
-#: include/php_setup.inc:216
+#: include/php_setup.inc:218
 msgid "Toggle information"
 msgstr "切换信息"
 
 #: include/class_session.inc:100 include/class_session.inc:137
-#: include/class_session.inc:175 include/class_acl.inc:1003
-#: include/class_log.inc:97 include/class_ldap.inc:871
-#: include/class_ldap.inc:922 include/functions.inc:682
-#: include/functions.inc:769 include/functions.inc:891
-#: include/functions.inc:1322 include/functions.inc:2421
-#: include/functions.inc:2463 include/functions.inc:2492
+#: include/class_session.inc:175 include/class_acl.inc:968
+#: include/class_log.inc:97 include/class_ldap.inc:862
+#: include/class_ldap.inc:898 include/functions.inc:664
+#: include/functions.inc:751 include/functions.inc:871
+#: include/functions.inc:1290 include/functions.inc:2384
+#: include/functions.inc:2426 include/functions.inc:2455
 msgid "Internal error"
 msgstr ""
 
@@ -3525,12 +3406,12 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:162
-#, fuzzy, php-format
+#, php-format
 msgid "Show %s"
-msgstr "显示服务器"
+msgstr ""
 
 #: include/simpleplugin/class_simpleManagement.inc:294
-#: include/class_management.inc:483
+#: include/class_management.inc:487
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
@@ -3538,102 +3419,135 @@ msgstr ""
 #: include/simpleplugin/class_simpleManagement.inc:338
 #: include/simpleplugin/class_simpleManagement.inc:353
 #: include/simpleplugin/class_simpleManagement.inc:378
-#: include/class_management.inc:536 include/class_management.inc:576
-#: include/class_management.inc:590
+#: include/class_management.inc:542 include/class_management.inc:587
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
+#: include/simpleplugin/class_dialogAttributes.inc:410
+msgid "Group of user"
+msgstr "用户组"
+
+#: include/simpleplugin/class_dialogAttributes.inc:579
+#: include/simpleplugin/class_attribute.inc:812
+#: include/simpleplugin/class_attribute.inc:846
+msgid "None"
+msgstr ""
+
 #: include/simpleplugin/simple-list.xml:11
 msgid "NO LABEL"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:442
-#: include/simpleplugin/class_attribute.inc:1507
+#: include/simpleplugin/class_attribute.inc:444
+#: include/simpleplugin/class_attribute.inc:1679
 #, php-format
 msgid "%s (required)"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:782
-#: include/simpleplugin/class_attribute.inc:816
-msgid "None"
-msgstr ""
-
-#: include/simpleplugin/class_attribute.inc:910
+#: include/simpleplugin/class_attribute.inc:940
 #, php-format
 msgid "An integer between %d and %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:912
+#: include/simpleplugin/class_attribute.inc:942
 #, php-format
 msgid "An integer larger than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:914
+#: include/simpleplugin/class_attribute.inc:944
 #, php-format
 msgid "An integer smaller than %d"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:989
+#: include/simpleplugin/class_attribute.inc:1027
 #, php-format
 msgid "A float between %f and %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:991
+#: include/simpleplugin/class_attribute.inc:1029
 #, php-format
 msgid "A float larger than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:993
+#: include/simpleplugin/class_attribute.inc:1031
 #, php-format
 msgid "A float smaller than %f"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1100
+#: include/simpleplugin/class_attribute.inc:1138
 msgid "Error, incorrect date: "
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#: include/simpleplugin/class_attribute.inc:1137
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1172
+#: include/simpleplugin/class_attribute.inc:1175
+#: include/simpleplugin/class_attribute.inc:1178
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1134
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1172
 msgid "file is empty"
-msgstr "删除这个条目"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1137
+#: include/simpleplugin/class_attribute.inc:1175
 msgid "file not found"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1140
+#: include/simpleplugin/class_attribute.inc:1178
 msgid "file not readable"
 msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1215
+#: include/simpleplugin/class_attribute.inc:1253
+#: include/simpleplugin/class_attribute.inc:1358
 msgid "Upload"
-msgstr ""
+msgstr "上传"
 
-#: include/simpleplugin/class_attribute.inc:1218
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1256
 msgid "Download"
-msgstr "关闭"
+msgstr "下载"
+
+#: include/simpleplugin/class_attribute.inc:1337
+msgid ""
+"Cannot save user picture, FusionDirectory requires the package "
+"'php5-imagick' to be installed!"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1244
-#, fuzzy
+#: include/simpleplugin/class_attribute.inc:1394
 msgid "Object base"
-msgstr "对象名称"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2071 include/class_listing.inc:289
+msgid "Sort up"
+msgstr ""
 
-#: include/simpleplugin/class_attribute.inc:1976
+#: include/simpleplugin/class_attribute.inc:2076 include/class_listing.inc:289
+msgid "Sort down"
+msgstr ""
+
+#: include/simpleplugin/class_attribute.inc:2151
 #, php-format
 msgid "Invalid value for %s"
 msgstr ""
 
+#: include/simpleplugin/class_simplePlugin.inc:551
+#: include/simpleplugin/class_simplePlugin.inc:559
+msgid "Error when saving"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:551
+#, php-format
+msgid "There is already an entry with the same dn : %s"
+msgstr ""
+
+#: include/simpleplugin/class_simplePlugin.inc:559
+#, php-format
+msgid "The entry %s is not existing"
+msgstr ""
+
 #: include/class_smbHash.inc:356
-msgid "Your PHP install does not have the mhash() function. Cannot do hashes."
+msgid ""
+"Your PHP install does not have the mhash() nor the hash function. Cannot do "
+"MD4 hashes."
 msgstr ""
 
 #: include/class_msgPool.inc:43
@@ -3655,7 +3569,7 @@ msgstr ""
 msgid "Select to search within subtrees"
 msgstr "选择在子树中查询"
 
-#: include/class_msgPool.inc:51 include/class_filter.inc:397
+#: include/class_msgPool.inc:51 include/class_filter.inc:396
 #: plugins/admin/ogroups/ogroup_objects.tpl.c:11
 msgid "Search in subtrees"
 msgstr ""
@@ -3793,111 +3707,111 @@ msgstr ""
 msgid "Command specified as %s hook for plugin '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:307
+#: include/class_msgPool.inc:308
 #, php-format
 msgid "'%s' command is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:309
-#, php-format
-msgid "'%s' command (%s) for plugin %s is invalid!"
-msgstr ""
-
-#: include/class_msgPool.inc:311
+#: include/class_msgPool.inc:310
 #, php-format
 msgid "'%s' command for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:313
+#: include/class_msgPool.inc:314
 #, php-format
 msgid "'%s' command (%s) is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:329
+#: include/class_msgPool.inc:316
 #, php-format
-msgid "Cannot execute '%s' command!"
+msgid "'%s' command (%s) for plugin %s is invalid!"
 msgstr ""
 
-#: include/class_msgPool.inc:331
+#: include/class_msgPool.inc:334
 #, php-format
-msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgid "Cannot execute '%s' command!"
 msgstr ""
 
-#: include/class_msgPool.inc:333
+#: include/class_msgPool.inc:336
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:335
+#: include/class_msgPool.inc:340
 #, php-format
 msgid "Cannot execute '%s' command (%s)!"
 msgstr ""
 
-#: include/class_msgPool.inc:349
+#: include/class_msgPool.inc:342
+#, php-format
+msgid "Cannot execute '%s' command (%s) for plugin %s!"
+msgstr ""
+
+#: include/class_msgPool.inc:357
 #, php-format
 msgid "Value for '%s' is too large!"
 msgstr ""
 
-#: include/class_msgPool.inc:351
+#: include/class_msgPool.inc:359
 #, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr ""
 
-#: include/class_msgPool.inc:365
+#: include/class_msgPool.inc:373
 #, php-format
 msgid "Value for '%s' is too small!"
 msgstr ""
 
-#: include/class_msgPool.inc:367
+#: include/class_msgPool.inc:375
 #, php-format
 msgid "'%s' must be %d or above!"
 msgstr ""
 
-#: include/class_msgPool.inc:380
+#: include/class_msgPool.inc:388
 #, php-format
 msgid "'%s' depends on '%s' - please provide both values!"
 msgstr ""
 
-#: include/class_msgPool.inc:390
+#: include/class_msgPool.inc:398
 #, php-format
 msgid "There is already an entry with this '%s' attribute in the system!"
 msgstr ""
 
-#: include/class_msgPool.inc:400
+#: include/class_msgPool.inc:408
 #, php-format
 msgid "The required field '%s' is empty!"
 msgstr ""
 
-#: include/class_msgPool.inc:418
+#: include/class_msgPool.inc:426
 msgid "Example"
 msgstr ""
 
-#: include/class_msgPool.inc:438
+#: include/class_msgPool.inc:446
 #, php-format
 msgid "The Field '%s' contains invalid characters"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' is not allowed:"
 msgstr ""
 
-#: include/class_msgPool.inc:439
+#: include/class_msgPool.inc:447
 #, php-format
 msgid "'%s' are not allowed!"
 msgstr ""
 
-#: include/class_msgPool.inc:442
+#: include/class_msgPool.inc:450
 #, php-format
 msgid "The Field '%s' contains invalid characters!"
 msgstr ""
 
-#: include/class_msgPool.inc:453
+#: include/class_msgPool.inc:461
 #, php-format
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/class_msgPool.inc:461 ihtml/themes/default/msg_dialog.tpl.c:17
+#: include/class_msgPool.inc:469 ihtml/themes/default/msg_dialog.tpl.c:17
 #: ihtml/themes/default/msg_dialog.tpl.c:35
 #: ihtml/themes/default/msg_dialog.tpl.c:41
 #: ihtml/themes/default/snapshotdialog.tpl.c:23
@@ -3910,11 +3824,10 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:158 setup/setup_migrate.tpl.c:185
 #: setup/setup_migrate.tpl.c:215 setup/setup_migrate.tpl.c:245
 #: setup/setup_migrate.tpl.c:275
-#, php-format
 msgid "Cancel"
 msgstr "取消"
 
-#: include/class_msgPool.inc:477 ihtml/themes/default/acl.tpl.c:17
+#: include/class_msgPool.inc:485 ihtml/themes/default/acl.tpl.c:17
 #: ihtml/themes/default/acl.tpl.c:26 ihtml/themes/default/acl.tpl.c:56
 #: ihtml/themes/default/acl.tpl.c:62 setup/setup_ldap.tpl.c:8
 #: setup/setup_migrate.tpl.c:44 setup/setup_migrate.tpl.c:71
@@ -3922,300 +3835,300 @@ msgstr "取消"
 #: setup/setup_migrate.tpl.c:155 setup/setup_migrate.tpl.c:182
 #: setup/setup_migrate.tpl.c:212 setup/setup_migrate.tpl.c:242
 #: setup/setup_migrate.tpl.c:272
-#, php-format
 msgid "Apply"
 msgstr "应用"
 
-#: include/class_msgPool.inc:485 ihtml/themes/default/copyPasteDialog.tpl.c:14
-#, php-format
+#: include/class_msgPool.inc:493 ihtml/themes/default/copyPasteDialog.tpl.c:14
 msgid "Save"
 msgstr "保存"
 
-#: include/class_msgPool.inc:495
+#: include/class_msgPool.inc:503
 #, php-format
 msgid "Add %s"
 msgstr ""
 
-#: include/class_msgPool.inc:505
+#: include/class_msgPool.inc:513
 #, php-format
 msgid "Delete %s"
 msgstr ""
 
-#: include/class_msgPool.inc:515 ihtml/themes/default/sizelimit.tpl.c:14
+#: include/class_msgPool.inc:523 ihtml/themes/default/sizelimit.tpl.c:14
 #, php-format
 msgid "Set"
 msgstr "设置"
 
-#: include/class_msgPool.inc:515
+#: include/class_msgPool.inc:523
 #, php-format
 msgid "Set %s"
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit..."
 msgstr ""
 
-#: include/class_msgPool.inc:525
+#: include/class_msgPool.inc:533
 #, php-format
 msgid "Edit %s..."
 msgstr ""
 
-#: include/class_msgPool.inc:533
+#: include/class_msgPool.inc:541
 msgid "Back"
 msgstr "返回"
 
-#: include/class_msgPool.inc:562
+#: include/class_msgPool.inc:570
 #, php-format
 msgid "This account has no valid %s extensions!"
 msgstr ""
 
-#: include/class_msgPool.inc:575
+#: include/class_msgPool.inc:583
 #, php-format
 msgid ""
-"This account has %s settings enabled. You can disable them by clicking below."
+"This account has %s settings enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:581 include/class_msgPool.inc:588
+#: include/class_msgPool.inc:589 include/class_msgPool.inc:596
 #, php-format
 msgid ""
-"This account has %s settings enabled. To disable them, you'll need to remove "
-"the %s settings first!"
+"This account has %s settings enabled. To disable them, you'll need to remove"
+" the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:603
+#: include/class_msgPool.inc:611
 #, php-format
 msgid ""
-"This account has %s settings disabled. You can enable them by clicking below."
+"This account has %s settings disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: include/class_msgPool.inc:609 include/class_msgPool.inc:616
+#: include/class_msgPool.inc:617 include/class_msgPool.inc:624
 #, php-format
 msgid ""
 "This account has %s settings disabled. To enable them, you'll need to add "
 "the %s settings first!"
 msgstr ""
 
-#: include/class_msgPool.inc:628
+#: include/class_msgPool.inc:636
 #, php-format
 msgid "Add %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:639
+#: include/class_msgPool.inc:647
 #, php-format
 msgid "Remove %s settings"
 msgstr ""
 
-#: include/class_msgPool.inc:647
+#: include/class_msgPool.inc:655
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "January"
 msgstr "一月"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "February"
 msgstr "二月"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "March"
 msgstr "三月"
 
-#: include/class_msgPool.inc:655
+#: include/class_msgPool.inc:663
 msgid "April"
 msgstr "四月"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "May"
 msgstr "五月"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "June"
 msgstr "六月"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "July"
 msgstr "七月"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "August"
 msgstr "八月"
 
-#: include/class_msgPool.inc:656
+#: include/class_msgPool.inc:664
 msgid "September"
 msgstr "九月"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "October"
 msgstr "十月"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "November"
 msgstr "十一月"
 
-#: include/class_msgPool.inc:657
+#: include/class_msgPool.inc:665
 msgid "December"
 msgstr "十二月"
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Sunday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Monday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Tuesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Wednesday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Thursday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Friday"
 msgstr ""
 
-#: include/class_msgPool.inc:666
+#: include/class_msgPool.inc:674
 msgid "Saturday"
 msgstr ""
 
-#: include/class_msgPool.inc:679
+#: include/class_msgPool.inc:687
 msgid "Database operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "read operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "add operation"
 msgstr ""
 
-#: include/class_msgPool.inc:697
+#: include/class_msgPool.inc:705
 msgid "modify operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "delete operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "search operation"
 msgstr ""
 
-#: include/class_msgPool.inc:698
+#: include/class_msgPool.inc:706
 msgid "authentication"
 msgstr ""
 
-#: include/class_msgPool.inc:701
+#: include/class_msgPool.inc:709
 #, php-format
 msgid "LDAP %s failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:703
+#: include/class_msgPool.inc:711
 msgid "LDAP operation failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:722
+#: include/class_msgPool.inc:730
 msgid "Upload failed!"
 msgstr ""
 
-#: include/class_msgPool.inc:725
+#: include/class_msgPool.inc:733
 #, php-format
 msgid "Upload failed: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:736
+#: include/class_msgPool.inc:744
 msgid "Communication failure with the infrastructure service!"
 msgstr ""
 
-#: include/class_msgPool.inc:738
+#: include/class_msgPool.inc:746
 #, php-format
 msgid "Communication failure with the infrastructure service: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:751 include/class_msgPool.inc:754
+#: include/class_msgPool.inc:759 include/class_msgPool.inc:762
 #, php-format
 msgid "This '%s' is still in use by this object: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:757
+#: include/class_msgPool.inc:765
 #, php-format
 msgid "This '%s' is still in use."
 msgstr ""
 
-#: include/class_msgPool.inc:759
+#: include/class_msgPool.inc:767
 #, php-format
 msgid "This '%s' is still in use by these objects: %s"
 msgstr ""
 
-#: include/class_msgPool.inc:769
+#: include/class_msgPool.inc:777
 #, php-format
 msgid "File '%s' does not exist!"
 msgstr ""
 
-#: include/class_msgPool.inc:779
+#: include/class_msgPool.inc:787
 #, php-format
 msgid "Cannot open file '%s' for reading!"
 msgstr ""
 
-#: include/class_msgPool.inc:789
+#: include/class_msgPool.inc:797
 #, php-format
 msgid "Cannot open file '%s' for writing!"
 msgstr ""
 
-#: include/class_msgPool.inc:799
+#: include/class_msgPool.inc:807
 #, php-format
 msgid ""
 "The value for '%s' is currently unconfigured or invalid, please check your "
 "configuration file!"
 msgstr ""
 
-#: include/class_msgPool.inc:809
+#: include/class_msgPool.inc:817
 #, php-format
 msgid "Cannot delete file '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:819
+#: include/class_msgPool.inc:827
 #, php-format
 msgid "Cannot create folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:829
+#: include/class_msgPool.inc:837
 #, php-format
 msgid "Cannot delete folder '%s'!"
 msgstr ""
 
-#: include/class_msgPool.inc:839
+#: include/class_msgPool.inc:847
 #, php-format
 msgid "Checking for %s support"
 msgstr ""
 
-#: include/class_msgPool.inc:849
+#: include/class_msgPool.inc:857
 #, php-format
 msgid "Install and activate the %s PHP module."
 msgstr ""
 
-#: include/class_msgPool.inc:859
+#: include/class_msgPool.inc:867
 #, php-format
 msgid "Install and activate the %s Pear module."
 msgstr ""
 
-#: include/class_msgPool.inc:869
+#: include/class_msgPool.inc:877
 #, php-format
 msgid ""
 "Cannot initialize class '%s'! Maybe there is a plugin missing in your "
 "FusionDirectory setup?"
 msgstr ""
 
-#: include/class_msgPool.inc:877
+#: include/class_msgPool.inc:885
 msgid ""
 "The supplied base is not valid and has been reset to the previous value!"
 msgstr ""
@@ -4236,102 +4149,105 @@ msgstr ""
 msgid "PDF"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:168
+#: include/class_management.inc:167
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: include/class_management.inc:657
+#: include/class_management.inc:653
 #, php-format
 msgid ""
 "No tab declaration for '%s' found in your configuration file. Cannot create "
 "plugin instance!"
 msgstr ""
 
-#: include/class_filter.inc:348 include/functions.inc:2285
+#: include/class_filter.inc:347 include/functions.inc:2247
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_filter.inc:386 include/functions.inc:2001
+#: include/class_filter.inc:385 include/functions.inc:1970
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/class_certificate.inc:87
+#: include/class_certificate.inc:86
 msgid "Certificate is empty!"
 msgstr ""
 
-#: include/class_certificate.inc:114
+#: include/class_certificate.inc:113
 msgid "Cannot load certificate - only PEM/DER is supported!"
 msgstr ""
 
-#: include/class_certificate.inc:135
+#: include/class_certificate.inc:134
 msgid "Cannot extract information for non PEM certificates!"
 msgstr ""
 
-#: include/class_certificate.inc:264
+#: include/class_certificate.inc:253
 msgid "No valid certificate loaded!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:292
+#: include/class_CopyPasteHandler.inc:294
 #: ihtml/themes/default/copyPasteDialog.tpl.c:20
 msgid "Cancel all"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:400 include/class_listing.inc:1515
-#: include/class_listing.inc:1517
+#: include/class_CopyPasteHandler.inc:402 include/class_listing.inc:1524
+#: include/class_listing.inc:1526
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_CopyPasteHandler.inc:402
+#: include/class_CopyPasteHandler.inc:404
 msgid "Cannot paste"
 msgstr ""
 
-#: include/class_config.inc:159
+#: include/class_config.inc:162
 #, php-format
 msgid "XML error in fusiondirectory.conf: %s at line %d"
 msgstr "XML 出错于 fusiondirectory.conf: %s ,行 %d"
 
-#: include/class_config.inc:330
+#: include/class_config.inc:335
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:484
+#: include/class_config.inc:489
 #, php-format
 msgid "The selected mail method (class %s) is not available"
 msgstr ""
 
-#: include/class_config.inc:654
+#: include/class_config.inc:653
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:1151 include/class_config.inc:1182
-#: include/class_SnapshotHandler.inc:58 include/class_SnapshotHandler.inc:89
+#: include/class_config.inc:1128 include/class_config.inc:1159
 #, php-format
 msgid ""
-"The snapshot functionality is enabled, but the required variable '%s' is not "
-"set."
+"The snapshot functionality is enabled, but the required variable '%s' is not"
+" set."
 msgstr ""
 
-#: include/class_config.inc:1164 include/class_SnapshotHandler.inc:71
+#: include/class_config.inc:1141
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
 
-#: include/class_config.inc:1276
+#: include/class_config.inc:1250
+msgid "All categories"
+msgstr ""
+
+#: include/class_config.inc:1336
 msgid "My account"
 msgstr "我的账号"
 
-#: include/class_baseSelector.inc:205 include/class_listing.inc:1097
-#: include/class_listing.inc:1099
+#: include/class_baseSelector.inc:206 include/class_listing.inc:1106
+#: include/class_listing.inc:1108
 msgid "Root"
 msgstr "æ ¹"
 
-#: include/class_baseSelector.inc:252 include/class_listing.inc:1120
+#: include/class_baseSelector.inc:253 include/class_listing.inc:1129
 msgid "Submit"
 msgstr "提交"
 
@@ -4344,199 +4260,199 @@ msgstr ""
 msgid "Cannot change password, unknown user '%s'"
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:342
+#: include/password-methods/class_password-methods.inc:320
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
-#: include/class_plugin.inc:562
+#: include/class_plugin.inc:551
 msgid ""
-"The object has changed since opened in FusionDirectory. All changes that may "
-"be done by others get lost if you save this entry!"
+"The object has changed since opened in FusionDirectory. All changes that may"
+" be done by others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1674
+#: include/class_plugin.inc:1657
 msgid "from"
 msgstr "从"
 
-#: include/class_acl.inc:130 include/class_acl.inc:589
-#: include/class_acl.inc:1060
+#: include/class_acl.inc:123 include/class_acl.inc:554
+#: include/class_acl.inc:1025
 #, php-format
 msgid "All users"
 msgstr ""
 
-#: include/class_acl.inc:228
+#: include/class_acl.inc:192
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:233 include/class_acl.inc:236
+#: include/class_acl.inc:197 include/class_acl.inc:200
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:551
+#: include/class_acl.inc:516
 msgid "No ACL settings for this category!"
 msgstr ""
 
-#: include/class_acl.inc:553
+#: include/class_acl.inc:518
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:559 include/class_acl.inc:563
+#: include/class_acl.inc:524 include/class_acl.inc:528
 msgid "category ACL"
 msgstr ""
 
-#: include/class_acl.inc:615
+#: include/class_acl.inc:580
 #, php-format
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:800 include/class_acl.inc:807
+#: include/class_acl.inc:765 include/class_acl.inc:772
 msgid "Show/hide advanced settings"
 msgstr ""
 
-#: include/class_acl.inc:824
+#: include/class_acl.inc:789
 msgid "Create objects"
 msgstr ""
 
-#: include/class_acl.inc:825
+#: include/class_acl.inc:790
 msgid "Move objects"
 msgstr ""
 
-#: include/class_acl.inc:826
+#: include/class_acl.inc:791
 msgid "Remove objects"
 msgstr ""
 
-#: include/class_acl.inc:828
+#: include/class_acl.inc:793
 msgid "Grant permission to owner"
 msgstr ""
 
-#: include/class_acl.inc:832 include/class_acl.inc:955
-#: include/class_acl.inc:959
+#: include/class_acl.inc:797 include/class_acl.inc:920
+#: include/class_acl.inc:924
 msgid "read"
 msgstr "读"
 
-#: include/class_acl.inc:833 include/class_acl.inc:957
-#: include/class_acl.inc:960
+#: include/class_acl.inc:798 include/class_acl.inc:922
+#: include/class_acl.inc:925
 msgid "write"
 msgstr "写"
 
-#: include/class_acl.inc:837
+#: include/class_acl.inc:802
 msgid "Complete object"
 msgstr ""
 
-#: include/class_acl.inc:1003
+#: include/class_acl.inc:968
 #, php-format
 msgid "Unkown ACL type '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1056
+#: include/class_acl.inc:1021
 #, php-format
 msgid "Unknown entry '%s'!"
 msgstr ""
 
-#: include/class_acl.inc:1128 include/class_acl.inc:1130
+#: include/class_acl.inc:1093 include/class_acl.inc:1095
 #, php-format
 msgid "Role: %s"
 msgstr ""
 
-#: include/class_acl.inc:1130
+#: include/class_acl.inc:1095
 msgid "unknown role"
 msgstr ""
 
-#: include/class_acl.inc:1138
+#: include/class_acl.inc:1103
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1149 ihtml/themes/default/acl.tpl.c:38
+#: include/class_acl.inc:1114 ihtml/themes/default/acl.tpl.c:38
 msgid "Members"
 msgstr "成员"
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1155
+#: include/class_acl.inc:1120
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1345
+#: include/class_acl.inc:1310
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:1347
+#: include/class_acl.inc:1312
 msgid "ACL roles"
 msgstr ""
 
-#: include/class_listing.inc:351 setup/setup_migrate.tpl.c:35
+#: include/class_listing.inc:350 setup/setup_migrate.tpl.c:35
 #: setup/setup_migrate.tpl.c:62 setup/setup_migrate.tpl.c:146
 #: setup/setup_migrate.tpl.c:173 setup/setup_migrate.tpl.c:200
 #: setup/setup_migrate.tpl.c:230 setup/setup_migrate.tpl.c:260
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:563
+#: include/class_listing.inc:562
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1097
+#: include/class_listing.inc:1106
 msgid "Go to root department"
 msgstr "转到根部门"
 
-#: include/class_listing.inc:1105
+#: include/class_listing.inc:1114
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_listing.inc:1113
+#: include/class_listing.inc:1122
 msgid "Go to users department"
 msgstr "转到用户部门"
 
-#: include/class_listing.inc:1113 include/class_listing.inc:1115
+#: include/class_listing.inc:1122 include/class_listing.inc:1124
 msgid "Home"
 msgstr ""
 
-#: include/class_listing.inc:1120
+#: include/class_listing.inc:1129
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: include/class_listing.inc:1501 include/class_listing.inc:1551
+#: include/class_listing.inc:1510 include/class_listing.inc:1560
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1507 include/class_listing.inc:1541
+#: include/class_listing.inc:1516 include/class_listing.inc:1550
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1541
+#: include/class_listing.inc:1550
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1551
+#: include/class_listing.inc:1560
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1583 include/class_listing.inc:1585
+#: include/class_listing.inc:1592 include/class_listing.inc:1594
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1599
+#: include/class_listing.inc:1608
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1634 include/class_listing.inc:1635
-#: include/class_SnapShotDialog.inc:313
+#: include/class_listing.inc:1643 include/class_listing.inc:1644
+#: include/class_SnapShotDialog.inc:192
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1644
+#: include/class_listing.inc:1653
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1645
+#: include/class_listing.inc:1654
 msgid "Create a new snapshot from this object"
 msgstr ""
 
@@ -4561,62 +4477,63 @@ msgid ""
 "calculate correct timezone offset."
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:315 include/class_ldap.inc:359
+#: include/class_ldap.inc:315 include/class_ldap.inc:362
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:871
+#: include/class_ldap.inc:862
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:922
+#: include/class_ldap.inc:898
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:1031
+#: include/class_ldap.inc:1009
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1033
+#: include/class_ldap.inc:1011
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1097
+#: include/class_ldap.inc:1071
 #, php-format
 msgid "Missing command line programm '%s'!"
 msgstr ""
 
-#: include/class_ldap.inc:1246
+#: include/class_ldap.inc:1217
 #, php-format
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...'"
+" in line %s"
 msgstr "这不是一条有效的 DN: '%s'。导入数据应该以 'dn:...' 开始于行 %s"
 
-#: include/class_ldap.inc:1275
+#: include/class_ldap.inc:1228
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "导入 dn: '%s' 时错误,请从行 %s 开始检查您的 LDIF!"
 
 #: include/class_msg_dialog.inc:167
 msgid "Please fix the above error and reload the page."
 msgstr ""
 
-#: include/class_pluglist.inc:121
+#: include/class_pluglist.inc:144
 msgid "All objects in this category"
 msgstr ""
 
-#: include/class_pluglist.inc:273
+#: include/class_pluglist.inc:296
 msgid "The configuration format has changed. Please re-run setup!"
 msgstr ""
 
@@ -4624,223 +4541,222 @@ msgstr ""
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:259
+#: include/class_SnapShotDialog.inc:140
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:315
+#: include/class_SnapShotDialog.inc:194
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:317 include/class_SnapShotDialog.inc:337
+#: include/class_SnapShotDialog.inc:196 include/class_SnapShotDialog.inc:216
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/functions.inc:123
+#: include/functions.inc:124
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:137
+#: include/functions.inc:138
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:510
+#: include/functions.inc:491
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误:连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:591
+#: include/functions.inc:572
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:682
+#: include/functions.inc:664
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:769 include/functions.inc:891
+#: include/functions.inc:751 include/functions.inc:871
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:779
+#: include/functions.inc:761
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:912
+#: include/functions.inc:892
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1242
+#: include/functions.inc:1210
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制!"
 
-#: include/functions.inc:1244
+#: include/functions.inc:1212
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:1261 plugins/personal/generic/generic.tpl.c:65
+#: include/functions.inc:1229
 msgid "Configure"
 msgstr "配置"
 
-#: include/functions.inc:1266
+#: include/functions.inc:1234
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1708
+#: include/functions.inc:1680
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1710
+#: include/functions.inc:1682
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1712
+#: include/functions.inc:1684
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1968
+#: include/functions.inc:1939
 msgid "Entries per page"
 msgstr "每页条目数"
 
-#: include/functions.inc:2421
+#: include/functions.inc:2384
 #, php-format
 msgid ""
 "File '%s' could not be deleted. Try fusiondirectory-setup --check-"
 "directories to fix permissions."
 msgstr ""
 
-#: include/functions.inc:2463
+#: include/functions.inc:2426
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2492
+#: include/functions.inc:2455
 msgid "Cannot read to revision file!"
 msgstr ""
 
-#: include/functions.inc:2697 include/functions.inc:2701
-#: include/functions.inc:2707
+#: include/functions.inc:2670
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2745
+#: include/functions.inc:2705
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2771
+#: include/functions.inc:2732
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2778
+#: include/functions.inc:2739
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2804
+#: include/functions.inc:2764
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2807
+#: include/functions.inc:2767
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2812
+#: include/functions.inc:2771
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2815
+#: include/functions.inc:2774
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2837
+#: include/functions.inc:2796
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2838
+#: include/functions.inc:2797
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2842
+#: include/functions.inc:2801
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:2802
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:3114
+#: include/functions.inc:3058
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s',作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
 
-#: include/functions.inc:3468 include/functions.inc:3488
-#: include/functions.inc:3526 include/functions.inc:3538
-#: include/functions.inc:3542 include/functions.inc:3557
-#: include/functions.inc:3566
+#: include/functions.inc:3400 include/functions.inc:3421
+#: include/functions.inc:3459 include/functions.inc:3471
+#: include/functions.inc:3475 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3468
+#: include/functions.inc:3400
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3488
+#: include/functions.inc:3421
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3518
+#: include/functions.inc:3451
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3526
+#: include/functions.inc:3459
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3538 include/functions.inc:3542
+#: include/functions.inc:3471 include/functions.inc:3475
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3566
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3634
+#: include/functions.inc:3559
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -4900,7 +4816,6 @@ msgstr "点击这里登录"
 
 #: ihtml/themes/default/simple-filter.tpl.c:2
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:2
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:2
 #: plugins/admin/departments/dep-filter.tpl.c:2
 #: plugins/admin/users/user-filter.tpl.c:2
 #: plugins/admin/groups/group-filter.tpl.c:2
@@ -4910,6 +4825,7 @@ msgstr "点击这里登录"
 #: plugins/admin/acl/acl-filter.tpl.c:2
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:2
 #: plugins/admin/ogroups/ogroup-filter.tpl.c:2
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:2
 msgid "Filter"
 msgstr "过滤器"
 
@@ -4921,16 +4837,15 @@ msgstr "检测道会话冲突"
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
-"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the Logout button will close this session."
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is"
+" possible. Pressing the Logout button will close this session."
 msgstr ""
 
 #: ihtml/themes/default/conflict.tpl.c:11
 msgid ""
-"Ignoring this message will change/destroy the data you're currently editing, "
-"so please close multiple windows and log in again."
-msgstr ""
-"忽略这条信息将会修改/破坏您当前编辑的数据,所以请关闭多个窗口并重新登录。"
+"Ignoring this message will change/destroy the data you're currently editing,"
+" so please close multiple windows and log in again."
+msgstr "忽略这条信息将会修改/破坏您当前编辑的数据,所以请关闭多个窗口并重新登录。"
 
 #: ihtml/themes/default/conflict.tpl.c:14
 msgid "Logout"
@@ -4962,8 +4877,8 @@ msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:26
 msgid ""
-"If none of the above methods suits you, contact your administrator to change "
-"your password"
+"If none of the above methods suits you, contact your administrator to change"
+" your password"
 msgstr ""
 
 #: ihtml/themes/default/recovery.tpl.c:29
@@ -4982,9 +4897,9 @@ msgstr ""
 #: ihtml/themes/default/recovery.tpl.c:53
 #: ihtml/themes/default/password.tpl.c:56
 #: plugins/personal/password/password.tpl.c:20
-#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/password/password.tpl.c:41
 #: plugins/personal/generic/password.tpl.c:17
-#: plugins/personal/generic/password.tpl.c:41
+#: plugins/personal/generic/password.tpl.c:38
 msgid "Password strength"
 msgstr ""
 
@@ -5079,7 +4994,7 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:38
 msgid "Timestamp"
-msgstr ""
+msgstr "日期"
 
 #: ihtml/themes/default/snapshotdialog.tpl.c:41
 msgid "Reason for generating this snapshot"
@@ -5108,9 +5023,7 @@ msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may want to take over the lock by "
 "pressing the 'Edit anyway' button."
-msgstr ""
-"如果锁检查失败,明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“仍"
-"然编辑”按钮来接管这个锁文件。"
+msgstr "如果锁检查失败,明显的是另外的人在进行编辑操作时关闭了浏览器。您可以通过按“仍然编辑”按钮来接管这个锁文件。"
 
 #: ihtml/themes/default/islocked.tpl.c:11
 msgid "Read only"
@@ -5118,13 +5031,11 @@ msgstr ""
 
 #: ihtml/themes/default/sizelimit.tpl.c:2
 msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
+"The size limit option makes LDAP operations faster and saves the LDAP server"
+" from getting too much load. The easiest way to handle big databases without"
+" long timeouts would be to limit your search to smaller values and use "
 "filters to get the entries you are looking for."
-msgstr ""
-"大小限制选项会让 LDAP 操作更快,以免使 LDAP 服务器过载。最简单让大数据库处理"
-"不发成长时间超时的办法是,将查询缩小到更少并且使用过滤器。"
+msgstr "大小限制选项会让 LDAP 操作更快,以免使 LDAP 服务器过载。最简单让大数据库处理不发成长时间超时的办法是,将查询缩小到更少并且使用过滤器。"
 
 #: ihtml/themes/default/sizelimit.tpl.c:5
 msgid "Please choose the way to react for this session"
@@ -5206,10 +5117,6 @@ msgstr "登录:"
 msgid "Session expires in %d!"
 msgstr ""
 
-#: ihtml/themes/default/framework.tpl.c:14
-msgid "FusionDirectory main menu"
-msgstr ""
-
 #: ihtml/themes/default/remove.tpl.c:5
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -5232,17 +5139,17 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:23
 msgid ""
-"This dialog provides a simple way to change your password. Enter the current "
-"password and the new password (twice) in the fields below and press the "
+"This dialog provides a simple way to change your password. Enter the current"
+" password and the new password (twice) in the fields below and press the "
 "'Change' button."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl.c:38
 #: ihtml/themes/default/password.tpl.c:41
 #: plugins/personal/password/password.tpl.c:11
-#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:23
 #: plugins/personal/generic/password.tpl.c:8
-#: plugins/personal/generic/password.tpl.c:23
+#: plugins/personal/generic/password.tpl.c:20
 msgid "Current password"
 msgstr "当前口令"
 
@@ -5409,8 +5316,8 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:2
 msgid ""
-"During the LDAP inspection, we're going to check for several common pitfalls "
-"that may occur when migration to FusionDirectory base LDAP administration. "
+"During the LDAP inspection, we're going to check for several common pitfalls"
+" that may occur when migration to FusionDirectory base LDAP administration. "
 "You may want to fix the problems below, in order to provide smooth services."
 msgstr ""
 
@@ -5552,15 +5459,15 @@ msgstr ""
 
 #: setup/setup_migrate.tpl.c:188
 msgid ""
-"The listed devices are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"The listed devices are currently invisible in the FusionDirectory interface."
+" If you want to change this for a couple of devices, just select them and "
+"use the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_migrate.tpl.c:206 setup/setup_migrate.tpl.c:236
-#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:32
-#: plugins/personal/generic/password.tpl.c:29
-#: plugins/admin/users/password.tpl.c:23
+#: setup/setup_migrate.tpl.c:266 plugins/personal/password/password.tpl.c:29
+#: plugins/personal/generic/password.tpl.c:26
+#: plugins/admin/users/password.tpl.c:20
 msgid "Refresh"
 msgstr "刷新"
 
@@ -5574,8 +5481,8 @@ msgstr ""
 #: setup/setup_migrate.tpl.c:248
 msgid ""
 "The listed menus are currently invisible in the FusionDirectory interface. "
-"If you want to change this for a couple of devices, just select them and use "
-"the 'Migrate' button below."
+"If you want to change this for a couple of devices, just select them and use"
+" the 'Migrate' button below."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:2
@@ -5596,8 +5503,8 @@ msgstr ""
 
 #: setup/setup_feedback.tpl.c:20
 msgid ""
-"When checking this option, FusionDirectory will try to connect http://www."
-"fusiondirectory.org in order to submit your form anonymously."
+"When checking this option, FusionDirectory will try to connect "
+"http://www.fusiondirectory.org in order to submit your form anonymously."
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:26
@@ -5657,7 +5564,8 @@ msgid "What features of FusionDirectory do you use?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:80
-msgid "What features do you want to see in future versions of FusionDirectory?"
+msgid ""
+"What features do you want to see in future versions of FusionDirectory?"
 msgstr ""
 
 #: setup/setup_feedback.tpl.c:83
@@ -5671,8 +5579,8 @@ msgstr ""
 #: setup/setup_language.tpl.c:5
 msgid ""
 "At this point, you can select the site wide default language. Choosing "
-"'automatic' will use the language requested by the browser. This setting can "
-"be overriden per user."
+"'automatic' will use the language requested by the browser. This setting can"
+" be overriden per user."
 msgstr ""
 
 #: setup/setup_language.tpl.c:8
@@ -5687,27 +5595,27 @@ msgstr ""
 msgid "FusionDirectory core settings"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:14
+#: setup/setup_config3.tpl.c:11
 msgid "Enable edit locking"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:20
+#: setup/setup_config3.tpl.c:17
 msgid "FusionDirectory logging"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:29
+#: setup/setup_config3.tpl.c:26
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:47
+#: setup/setup_config3.tpl.c:44
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
+#: setup/setup_config3.tpl.c:56 setup/setup_config3.tpl.c:62
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl.c:62 setup/setup_config3.tpl.c:68
+#: setup/setup_config3.tpl.c:59 setup/setup_config3.tpl.c:65
 msgid "Enabled"
 msgstr ""
 
@@ -5820,8 +5728,8 @@ msgstr ""
 
 #: setup/setup_schema.tpl.c:17
 msgid ""
-"Could not read any schema informations, all checks skipped. Adjust your ldap "
-"acls."
+"Could not read any schema informations, all checks skipped. Adjust your ldap"
+" acls."
 msgstr ""
 
 #: setup/setup_schema.tpl.c:20
@@ -5884,9 +5792,7 @@ msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
 "be able to login without it."
-msgstr ""
-"用下面的表格更改个人口令。口令更改即时生效。请记住新口令,忘记口令将无法登"
-"录。"
+msgstr "用下面的表格更改个人口令。口令更改即时生效。请记住新口令,忘记口令将无法登录。"
 
 #: plugins/personal/password/password.tpl.c:5
 #: plugins/personal/generic/password.tpl.c:5
@@ -5901,38 +5807,33 @@ msgid "Your Password has expired. Please choose a new password!"
 msgstr ""
 
 #: plugins/personal/password/password.tpl.c:17
-#: plugins/personal/password/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:38
 #: plugins/personal/generic/password.tpl.c:14
-#: plugins/personal/generic/password.tpl.c:38
-#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:11 plugins/admin/users/password.tpl.c:29
 msgid "Repeat new password"
 msgstr "重复新口令"
 
-#: plugins/personal/password/password.tpl.c:23
-#: plugins/personal/generic/password.tpl.c:20
-msgid "Password change dialog"
-msgstr ""
-
-#: plugins/personal/password/password.tpl.c:29
-#: plugins/personal/generic/password.tpl.c:26
-#: plugins/admin/users/password.tpl.c:20
+#: plugins/personal/password/password.tpl.c:26
+#: plugins/personal/generic/password.tpl.c:23
+#: plugins/admin/users/password.tpl.c:17
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:35
-#: plugins/personal/generic/password.tpl.c:32
-#: plugins/admin/users/password.tpl.c:26
+#: plugins/personal/password/password.tpl.c:32
+#: plugins/personal/generic/password.tpl.c:29
+#: plugins/admin/users/password.tpl.c:23
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/personal/password/password.tpl.c:47
-#: plugins/personal/generic/password.tpl.c:44
-#: plugins/admin/users/password.tpl.c:41
+#: plugins/personal/password/password.tpl.c:44
+#: plugins/personal/generic/password.tpl.c:41
+#: plugins/admin/users/password.tpl.c:38
 msgid "Set password"
 msgstr "设置口令"
 
-#: plugins/personal/password/password.tpl.c:50
-#: plugins/personal/generic/password.tpl.c:47
+#: plugins/personal/password/password.tpl.c:47
+#: plugins/personal/generic/password.tpl.c:44
 msgid "Clear fields"
 msgstr "清除字段"
 
@@ -5940,55 +5841,10 @@ msgstr "清除字段"
 msgid "Your password hash method will not be changed!"
 msgstr ""
 
-#: plugins/personal/generic/generic_certs.tpl.c:2
-msgid "Certificates"
-msgstr "证书"
-
-#: plugins/personal/generic/generic_certs.tpl.c:5
-msgid "Standard certificate"
-msgstr "标准证书"
-
-#: plugins/personal/generic/generic_certs.tpl.c:11
-msgid "S/MIME certificate"
-msgstr "S/MIME 证书"
-
-#: plugins/personal/generic/generic_certs.tpl.c:17
-msgid "PKCS12 certificate"
-msgstr "PKCS12 证书"
-
-#: plugins/personal/generic/generic_certs.tpl.c:23
-msgid "Certificate serial number"
-msgstr "证书系列号"
-
-#: plugins/personal/generic/generic_picture.tpl.c:2
-#: plugins/personal/generic/paste_generic.tpl.c:23
-#: plugins/personal/generic/generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:14
-msgid "Personal picture"
-msgstr "个人图片"
-
-#: plugins/personal/generic/generic_picture.tpl.c:5
-#: plugins/personal/generic/paste_generic.tpl.c:29
-msgid "Remove picture"
-msgstr "删除图片"
-
 #: plugins/personal/generic/paste_generic.tpl.c:2
 msgid "User settings"
 msgstr "用户设置"
 
-#: plugins/personal/generic/paste_generic.tpl.c:5
-#: plugins/personal/generic/generic.tpl.c:20
-#: plugins/admin/users/template.tpl.c:11
-msgid "Last name"
-msgstr "å§“"
-
-#: plugins/personal/generic/paste_generic.tpl.c:8
-#: plugins/personal/generic/generic.tpl.c:26
-#: plugins/admin/users/template.tpl.c:14
-msgid "First name"
-msgstr "名"
-
 #: plugins/personal/generic/paste_generic.tpl.c:17
 msgid "Clear password"
 msgstr "清除口令"
@@ -5997,59 +5853,17 @@ msgstr "清除口令"
 msgid "Set new password"
 msgstr "设置新密码"
 
-#: plugins/personal/generic/generic.tpl.c:2
-msgid "Personal information"
-msgstr "个人信息"
-
-#: plugins/personal/generic/generic.tpl.c:11
-#: plugins/personal/generic/generic.tpl.c:17
-msgid "Change picture"
-msgstr "更换图片"
-
-#: plugins/personal/generic/generic.tpl.c:23
-msgid "Template name"
-msgstr "模板名称"
-
-#: plugins/personal/generic/generic.tpl.c:44
-msgid "Preferred langage"
-msgstr "首选语种"
-
-#: plugins/personal/generic/generic.tpl.c:56
-msgid "Private phone"
-msgstr "私人电话"
-
-#: plugins/personal/generic/generic.tpl.c:62
-msgid "Password storage"
-msgstr "口令存储"
-
-#: plugins/personal/generic/generic.tpl.c:68
-msgid "Restrict login to"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:71
-msgid "IP or network"
-msgstr ""
-
-#: plugins/personal/generic/generic.tpl.c:77
-msgid "Organizational information"
-msgstr "组织信息"
-
-#: plugins/personal/generic/generic.tpl.c:86
-msgid "Department No."
-msgstr "部门编号"
-
-#: plugins/personal/generic/generic.tpl.c:89
-msgid "Employee No."
-msgstr "员工编号"
+#: plugins/personal/generic/paste_generic.tpl.c:23
+msgid "Personal picture"
+msgstr "个人图片"
 
-#: plugins/personal/generic/generic.tpl.c:98
-#: plugins/personal/generic/generic.tpl.c:152
-msgid "Room No."
-msgstr "房间号"
+#: plugins/personal/generic/paste_generic.tpl.c:26
+msgid "User picture"
+msgstr "用户图片"
 
-#: plugins/personal/generic/generic.tpl.c:158
-msgid "Please use the phone tab"
-msgstr "请使用电话页面"
+#: plugins/personal/generic/paste_generic.tpl.c:29
+msgid "Remove picture"
+msgstr "删除图片"
 
 #: plugins/personal/posix/groupSelect/group-filter.tpl.c:5
 #: plugins/admin/groups/group-filter.tpl.c:5
@@ -6066,23 +5880,6 @@ msgstr "显示 samba 用户组"
 msgid "Show mail groups"
 msgstr ""
 
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:5
-msgid "Show servers"
-msgstr "显示服务器"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:8
-msgid "Show workstations"
-msgstr "显示工作站"
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:11
-#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
-msgid "Show Windows PC"
-msgstr ""
-
-#: plugins/personal/posix/trustSelect/trust-filter.tpl.c:14
-msgid "Show terminals"
-msgstr "显示终端"
-
 #: plugins/admin/departments/dcObject.tpl.c:5
 #: plugins/admin/departments/locality.tpl.c:5
 msgid "Locality name"
@@ -6101,15 +5898,6 @@ msgstr ""
 msgid "Descriptive text for department"
 msgstr "部门描述文件"
 
-#: plugins/admin/departments/dcObject.tpl.c:26
-#: plugins/admin/departments/locality.tpl.c:26
-#: plugins/admin/departments/country.tpl.c:26
-#: plugins/admin/departments/organization.tpl.c:65
-#: plugins/admin/departments/generic.tpl.c:65
-#: plugins/admin/departments/domain.tpl.c:26
-msgid "Tag department as an independent administrative unit"
-msgstr "将部门标记为独立的管理单元"
-
 #: plugins/admin/departments/dep_iframe.tpl.c:2
 msgid "Processing the requested operation"
 msgstr "处理请求的操作"
@@ -6194,9 +5982,7 @@ 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 树中的内容到一个文件。所以,如果您已经"
-"这么做了,按“删除”继续或者按“取消”退出。"
+msgstr "最好在执行这个操作之前,保存当前 LDAP 树中的内容到一个文件。所以,如果您已经这么做了,按“删除”继续或者按“取消”退出。"
 
 #: plugins/admin/departments/generic.tpl.c:5
 msgid "Name of department"
@@ -6241,9 +6027,7 @@ msgid ""
 "Creating a new user can be assisted by using templates. Many database "
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
-msgstr ""
-"可以使用模板来辅助新用户的创建。很多数据记录可以被自动填充。选择“无”来跳过模"
-"板选择。"
+msgstr "可以使用模板来辅助新用户的创建。很多数据记录可以被自动填充。选择“无”来跳过模板选择。"
 
 #: plugins/admin/users/user-filter.tpl.c:5
 msgid "Show templates"
@@ -6267,9 +6051,9 @@ msgstr ""
 
 #: plugins/admin/users/remove.tpl.c:5 plugins/admin/acl/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."
+"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 ""
 
 #: plugins/admin/users/password.tpl.c:2
@@ -6279,15 +6063,11 @@ msgid ""
 "able to login without it."
 msgstr "用下面的字段修改用口令。修改即时生效。请记住新密码,否则无法登录。"
 
-#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:35
+#: plugins/admin/users/password.tpl.c:14 plugins/admin/users/password.tpl.c:32
 msgid "Strength"
 msgstr ""
 
-#: plugins/admin/users/password.tpl.c:17
-msgid "Password input dialog"
-msgstr ""
-
-#: plugins/admin/users/password.tpl.c:38
+#: plugins/admin/users/password.tpl.c:35
 msgid "Enforce password change on next login."
 msgstr ""
 
@@ -6435,6 +6215,11 @@ msgstr ""
 msgid "Show workstation"
 msgstr ""
 
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:23
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:11
+msgid "Show Windows PC"
+msgstr ""
+
 #: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl.c:26
 msgid "Show terminal"
 msgstr ""
@@ -6498,3 +6283,15 @@ msgstr "组名称"
 #: plugins/admin/ogroups/generic.tpl.c:23
 msgid "Member objects"
 msgstr "成员对象"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:5
+msgid "Show servers"
+msgstr "显示服务器"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:8
+msgid "Show workstations"
+msgstr "显示工作站"
+
+#: include/simpleplugin/systemSelect/systemSelect-filter.tpl.c:14
+msgid "Show terminals"
+msgstr "显示终端"