From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 25 Nov 2010 15:17:26 +0000 (+0000)
Subject: Updated locale
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=27745e7b35dbe28a7d3f460df8b92abc06d9749f;p=gosa.git

Updated locale


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@20375 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index a4d2cc11a..63150502f 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -165,7 +165,7 @@ $plist= session::global_get('plist');
 if (isset($global_check) && $config->get_cfg_value("forceglobals") == "true"){
   msg_dialog::display(
             _("PHP configuration"),
-            _("FATAL: Register globals is on. GOsa will refuse to login unless this is fixed by an administrator."),
+            _("Fatal error: Register globals is on. GOsa will refuse to login unless this is fixed by an administrator."),
             FATAL_ERROR_DIALOG);
 
   new log("security","login","",array(),"Register globals is on. For security reasons, this should be turned off.") ;
@@ -371,7 +371,7 @@ if (is_file("$plugin_dir/main.inc")){
 } else {
   msg_dialog::display(
       _("Plugin"),
-      sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
+      sprintf(_("Fatal error: Cannot find any plugin definitions for plugin '%s'!"), $plug),
       FATAL_ERROR_DIALOG);
   exit();
 }
@@ -386,7 +386,7 @@ if (isset($_POST) && count($_POST)){
   if (!isset($_POST['php_c_check'])){
     msg_dialog::display(
             _("Configuration Error"),
-            sprintf(_("FATAL: not all POST variables have been transfered by PHP - please inform your administrator!")),
+            sprintf(_("Fatal error: not all POST variables have been transfered by PHP - please inform your administrator!")),
             FATAL_ERROR_DIALOG);
     exit();
   }
diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
index 3260f90e5..7fe7753d7 100644
--- a/gosa-core/locale/core/es/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2010-01-28 23:21+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +23,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -279,12 +280,12 @@ msgstr "Contraseña antigua"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nueva contraseña"
 
@@ -351,7 +352,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Objeto"
 
@@ -397,26 +398,27 @@ msgstr "Razón para generar esta instantánea"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Continuar"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -442,12 +444,13 @@ msgstr "Continuar"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -493,15 +496,9 @@ msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
@@ -529,9 +526,9 @@ msgstr "Repita la nueva contraseña"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 msgid "Password strength"
 msgstr "Seguridad de contraseña"
 
@@ -662,8 +659,8 @@ msgstr "No se puede acceder a la configuración de GOsa %s/%s. Cancelado"
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -692,7 +689,7 @@ msgid "Error: Password method not available!"
 msgstr "Error: ¡El método de contraseñas no esta disponible!"
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -700,12 +697,12 @@ msgstr ""
 "No coinciden las contraseñas introducidas como 'Nueva contraseña' y 'Repetir "
 "nueva contraseña'."
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr ""
 "La contraseña actual y la introducida como nueva son demasiado parecidas."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
@@ -713,11 +710,11 @@ msgstr "La nueva contraseña es demasiado corta."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Inicio"
@@ -775,34 +772,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -875,9 +872,10 @@ msgid "PHP configuration"
 msgstr "Configuración PHP"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "FATAL: 'Register globals' está activado. No se permitirá ninguna acceso "
 "hasta que esto sea solucionado por un administrador."
@@ -900,8 +898,8 @@ msgid "Plugin"
 msgstr "Extensión"
 
 #: html/main.php:374
-#, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+#, fuzzy, php-format
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 "FATAL: ¡No se puede encontrar ninguna definición de extensión para la "
 "extensión '%s'!"
@@ -911,10 +909,10 @@ msgid "Configuration Error"
 msgstr "Error de configuración"
 
 #: html/main.php:389
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 "FATAL: No todos las variables POST han sido transferidas por PHP - ¡Por "
 "favor informe a su administrador!"
@@ -957,29 +955,29 @@ msgstr "¡El filtro está incompleto!"
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr "Permiso"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr "Error de Permisos"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
@@ -1007,7 +1005,7 @@ msgstr "Ha fallado la conexión a la máquina '%s:%s': %s"
 msgid "Socket timeout of %s seconds reached."
 msgstr "Tiempo excedido de %s segundos para conexión alcanzado."
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 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 "
@@ -1076,7 +1074,7 @@ msgid "Use ACL defined in role"
 msgstr "Utilizar las ACL definidas en el rol"
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Usuarios"
@@ -1089,19 +1087,19 @@ msgstr "Grupos"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Arriba"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Abajo"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1121,7 +1119,7 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1188,8 +1186,8 @@ msgstr "Objeto completo"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1291,26 +1289,26 @@ msgid "Actions"
 msgstr "Acciones"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr "Copiar"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr "Mover"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
@@ -1323,23 +1321,28 @@ msgid "Export list"
 msgstr "Exportar lista"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Exportar lista"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Eliminar esta entrada"
 
@@ -1418,7 +1421,7 @@ 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:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Configurar"
 
@@ -1447,54 +1450,54 @@ msgstr "Entradas por página"
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "servicio de registro de GOsa"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, fuzzy, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "Instantánea de desarrollo GOsa (Rev %s)"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Instantánea de desarrollo GOsa (Rev %s)"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "El archivo '%s' no puede ser eliminado."
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "No esta disponible 'baseIdHook'.¡Se usara la base predeterminada!"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 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!"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr "Usado para guardar información específica de la cuenta."
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1502,28 +1505,28 @@ msgstr ""
 "Usado para bloquear entradas editadas actualmente y así evitar múltiples "
 "cambios simultáneos."
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 "¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1531,7 +1534,7 @@ 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1539,7 +1542,7 @@ msgstr ""
 "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
 "debe ser AUXILIARY"
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1547,51 +1550,51 @@ msgstr ""
 "Su esquema está configurado para soportar grupos rfc2307bis, pero ha "
 "desactivado esta opción en el paso 'configuración ldap'."
 
-#: include/functions.inc:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Alemán"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Francés"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Español"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Inglés"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Holandes"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Polaco"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr "Chino"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Ruso"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1599,11 +1602,11 @@ msgstr ""
 "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
 "existir."
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr "¡No se puede generar la clave samba!"
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
@@ -1611,39 +1614,39 @@ msgstr ""
 "¡No se puede generar la clave samba: la ejecución de '%s' ha fallado, "
 "compruebe el 'sambaHashHook'!"
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 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:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr "¡método de asignación de id desconocido!"
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr "¡sambaUnixIdPool no es único!"
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr "¡No hay ID disponibles!"
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "¡Excedido el número de intentos máximo!"
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
@@ -1705,7 +1708,7 @@ msgstr "Y-m-d, H:i:s"
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1823,7 +1826,7 @@ msgstr "Argumentos"
 msgid "Search in subtrees"
 msgstr "Buscar en subárboles"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1831,29 +1834,29 @@ msgstr ""
 "Este objeto ha cambiado desde que ha sido abierto en GOsa. ¡Todos los "
 "cambios realizados por otros se perderán si graba esta entrada!"
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr "Modificando ACL dn"
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "desde"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr "a"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr "Recuperar"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "mover"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "copiar"
 
@@ -2158,8 +2161,8 @@ msgstr "¡Extensión PHP %s no encontrada!"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2490,7 +2493,12 @@ msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2499,7 +2507,7 @@ msgstr ""
 "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2579,7 +2587,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -2631,10 +2639,10 @@ msgstr "Por favor solucione el problema y actualize la página."
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Genérico"
@@ -2647,7 +2655,7 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Correo Electrónico"
@@ -2655,14 +2663,14 @@ msgstr "Correo Electrónico"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "FAX"
 
@@ -2692,8 +2700,8 @@ msgstr "Grupo"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Departamento"
 
@@ -2701,14 +2709,14 @@ msgstr "Departamento"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Teléfono"
@@ -2833,8 +2841,8 @@ msgstr "Usuario"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2842,7 +2850,7 @@ msgstr "Usuario"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2874,10 +2882,10 @@ msgstr "Usuario"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2907,13 +2915,13 @@ msgstr "Nombre"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3006,9 +3014,9 @@ msgstr ""
 "objetos!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "ninguno"
 
@@ -3159,7 +3167,7 @@ msgstr "Sumario FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3327,25 +3335,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Nombre de pila"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Apellido"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr "Edición multiple"
 
@@ -3559,19 +3567,19 @@ msgid "Edit posix properties"
 msgstr "Editar características posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Editar características de correo electrónico"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Editar características samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Editar características telefónicas"
@@ -3587,7 +3595,7 @@ msgid "Edit start menu properties"
 msgstr "Editar propiedades iniciales del menú"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Editar características de entorno"
@@ -3622,15 +3630,15 @@ msgstr ""
 "Cambiar la contraseña modifica la autenticación del usuario para el correo, "
 "proxy, samba y los servicios unix."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Reintroducir nueva contraseña"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr "Seguridad"
 
@@ -3646,28 +3654,28 @@ msgstr "Longitud mínima de la contraseña"
 msgid "Use proposal"
 msgstr "grupos de usuarios"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 msgid "Refresh"
 msgstr "Refresco"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "¡Por favor introduzca una contraseña!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Forzar el cambio de contraseña al iniciar"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Introducir contraseña"
 
@@ -3686,18 +3694,18 @@ msgstr ""
 "anular el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Plantilla"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Apellido"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Nombre"
@@ -3706,15 +3714,15 @@ msgstr "Nombre"
 msgid "Manage users"
 msgstr "Gestión de usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 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:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
@@ -3723,19 +3731,19 @@ msgstr ""
 "El método de contraseña '%s' no soporta bloqueo. ¡La cuenta (%s) no ha sido "
 "bloqueada!"
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Lock account"
 msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Editar características generales"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3743,19 +3751,19 @@ msgstr "Editar características generales"
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 msgid "Edit POSIX properties"
 msgstr "Editar características POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Editar características netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 msgid "Edit FAX properties"
 msgstr "Editar características FAX"
 
@@ -3883,8 +3891,8 @@ msgstr "Localidad"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Organización"
 
@@ -3916,11 +3924,11 @@ msgstr "Descripción del departamento"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Gestión de usuarios"
@@ -3935,7 +3943,7 @@ msgstr "Gestión de usuarios"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Parámetros administrativos"
@@ -3963,7 +3971,7 @@ msgstr "Descripción del departamento"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Categoría"
@@ -3977,20 +3985,20 @@ msgstr "Categoría para este subárbol"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Localización"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Provincia"
 
@@ -4005,10 +4013,10 @@ msgid "Location of this subtree"
 msgstr "Localización de este subárbol"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Dirección"
 
@@ -4025,12 +4033,12 @@ msgstr "Número base de teléfono de este subárbol"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Fax"
 
@@ -4048,8 +4056,8 @@ msgid "Domain Component"
 msgstr "Componentes del dominio"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -4072,7 +4080,7 @@ msgid "Organization name"
 msgstr "Nombre de la Organización"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Código Postal"
 
@@ -4103,40 +4111,40 @@ msgstr ""
 "¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
 "administrativa!"
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Etiquetando '%s'."
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Moviendo '%s' a '%s'"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Ha fallado a copiar %s, operación abortada"
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Nombre de departamento"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "El objeto '%s' está ya marcado"
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Añadir marca (%s) al objeto '%s'"
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Eliminando marca del objeto '%s'"
@@ -4246,8 +4254,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Rol"
 
@@ -4332,205 +4340,211 @@ msgstr "No hay certificados instalados"
 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:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 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:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "No se puede construir RDN: ¡Atributo no definido!"
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 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:1286
+#: plugins/personal/generic/class_user.inc:1272
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 "¡El método de contraseña seleccionado necesita una configuració inicial!"
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr "¡No puedo abrir el certificado!"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Profesión"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Última dirección conocida"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Lugar de residencia"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Área de desarrollo"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Función"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Visible por todos"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Títulos académicos"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto del usuario"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "Restricciones de contraseña"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Funciones laborales"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 msgid "User password method"
 msgstr "Metodo de contraseña de usuario"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "Entradas por página"
@@ -4548,72 +4562,71 @@ msgstr ""
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Foto"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Cambiar foto"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Teléfono privado"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Almacén de claves"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr "Restringir inicio de sesión a"
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr "IP o Red"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Por favor use la sección telefóno"
 
@@ -4655,8 +4668,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Cambio de contraseña"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Limpiar información"
 
@@ -4756,7 +4769,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4789,53 +4802,53 @@ msgstr "shadowWarning"
 msgid "shadowInactive"
 msgstr "shadowInactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr "Cuenta POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr "Identificador (ID) de Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr "Forzar el cambio de contraseña al iniciar"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr "Clave pública SSH"
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr "Sistema de confianza"
 
@@ -4952,31 +4965,30 @@ msgstr "Su contraseña ha caducado. ¡Por favor seleccione una nueva!"
 msgid "Change user password"
 msgstr "Cambiar contraseña de usuario"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "No se ha asignado ningún valor al campo 'Nueva contraseña'."
 
-#: plugins/personal/password/class_password.inc:144
+#: plugins/personal/password/class_password.inc:140
 #, php-format
-msgid "External password changer reported a problem: %s."
+msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
-"El programa externo de cambio de contraseña informo de un problema: %s."
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 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:164
+#: plugins/personal/password/class_password.inc:167
 msgid "You have no permission to change your password."
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr "Contraseña del usuario"
 
@@ -6677,6 +6689,10 @@ msgstr "Este paso le permite seleccionar su idioma preferido"
 msgid "Automatic"
 msgstr "Automatico"
 
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr ""
+#~ "El programa externo de cambio de contraseña informo de un problema: %s."
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "Miembro del grupo"
diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
index 7a22f5136..ba1a48a9b 100644
--- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2010-11-19 17:43+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -279,12 +280,12 @@ msgstr "Ancien mot de passe"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
@@ -351,7 +352,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Objet"
 
@@ -398,26 +399,27 @@ msgstr "Raison pour la génération de cette copie instantanée"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Continuer"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -443,12 +445,13 @@ msgstr "Continuer"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -494,15 +497,9 @@ msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe à été changé avec succès."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr "Changement de mot de passe"
 
@@ -530,9 +527,9 @@ msgstr "Nouveau mot de passe"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 msgid "Password strength"
 msgstr "Niveau de sécurité du mot de passe"
 
@@ -665,8 +662,8 @@ msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -697,7 +694,7 @@ msgid "Error: Password method not available!"
 msgstr "Erreur: Méthode de changement de mot de passe non disponible!"
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -705,11 +702,11 @@ 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/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "Le nouveau et l'ancien mot de passe sont trop similaires."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
@@ -717,11 +714,11 @@ msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Identifiant"
@@ -736,7 +733,8 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
 #: html/password.php:249
 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/password.php:280 html/index.php:406
 msgid "Session will not be encrypted."
@@ -780,34 +778,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -827,7 +825,8 @@ msgstr "Erreur LDAP"
 
 #: html/index.php:265
 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:278
 msgid "Your LDAP setup contains old schema definitions:"
@@ -870,23 +869,26 @@ msgstr "Smarty"
 #: html/main.php:148
 #, 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:167
 msgid "PHP configuration"
 msgstr "Configuration de PHP"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "FATAL: Register globals est activé. GOsa ne permettra pas aux utilisateurs "
 "de se connecter tant que ceci n'est pas corrigé par un administrateur."
 
 #: html/main.php:198
 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:268
 msgid "Running out of memory!"
@@ -901,8 +903,8 @@ msgid "Plugin"
 msgstr "Extension"
 
 #: html/main.php:374
-#, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+#, fuzzy, php-format
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAL: Impossible de trouver une définition pour l'extension '%s' !"
 
 #: html/main.php:388
@@ -910,10 +912,10 @@ msgid "Configuration Error"
 msgstr "Erreur de configuration"
 
 #: html/main.php:389
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 "FATAL: toute les variables POST non pas été transférées par PHP - Veuillez "
 "avertir votre administrateur !"
@@ -956,29 +958,30 @@ msgstr "Le filtre est incomplet !"
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr "Permissions"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, 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/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, 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."
@@ -1006,7 +1009,7 @@ msgstr "La connexion socket vers l'hôte '%s:%s' à echoué : %s"
 msgid "Socket timeout of %s seconds reached."
 msgstr "Le temps limite du socket de '%s' secondes à été atteint."
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 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 "
@@ -1075,7 +1078,7 @@ msgid "Use ACL defined in role"
 msgstr "Utiliser l'ACL définie dans le rôle"
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Utilisateurs"
@@ -1088,19 +1091,19 @@ msgstr "Groupes"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Au dessus"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "En bas"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1120,7 +1123,7 @@ msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1187,8 +1190,8 @@ msgstr "L'objet au complet"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1291,26 +1294,26 @@ msgid "Actions"
 msgstr ""
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr "Copier"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr "Couper"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
@@ -1323,23 +1326,28 @@ msgid "Export list"
 msgstr "Exporter la liste"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Exporter la liste"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
@@ -1352,7 +1360,8 @@ msgstr ""
 
 #: include/functions.inc:141
 #, php-format
-msgid "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
+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"
@@ -1361,12 +1370,13 @@ msgstr ""
 #, 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'."
+"FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu "
+"'%s'."
 
 #: include/functions.inc:526
 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:611
 msgid ""
@@ -1416,7 +1426,7 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Configurer"
 
@@ -1445,54 +1455,54 @@ msgstr "Entrées par page"
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, php-format
 msgid "GOsa %s"
 msgstr ""
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "Version de développement de GOsa %s (Rev %s)"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Le fichier '%s' ne peut pas être éffacé."
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' n'est pas disponible. Utilisation de la base par défaut !"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 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 !"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr "Utilisé pour stocker les informations spécifiques des comptes."
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1500,27 +1510,27 @@ msgstr ""
 "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
 "multiples changements simultanés."
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Object class obligatoire '%s' manquante !"
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Object class facultative '%s' manquante !"
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, 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:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1529,7 +1539,7 @@ msgstr ""
 "serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
 "supportent pas cette option."
 
-#: include/functions.inc:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1537,7 +1547,7 @@ msgstr ""
 "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
 "l'objectClass 'posixGroup' doit être       AUXILIARY"
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1546,101 +1556,103 @@ msgstr ""
 "avez désactivé cette option lors de l'étape 'configuration de l'annuaire "
 "ldap' du programme d'installation."
 
-#: include/functions.inc:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Allemand"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Français"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italien"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Anglais"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Polonais"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr "Chinois"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Russe"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
-msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+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."
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr "Impossible de générer un hash samba !"
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
-msgid "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
+msgid ""
+"Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 "Impossible de générer le mot de passe samba: l'exécution de '%s' à échoué, "
 "veuillez vérifier le paramètre 'sambaHashHook'!"
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr "Impossible d'assigner un ID libre :"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr "Méthode d'allocation des id inconnue !"
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool n'est pas unique !"
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr "Pas d' ID disponibles !"
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr "Nombre maximum d'essais dépassés !"
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 msgid "Cannot allocate a free ID!"
 msgstr "Impossible d'assigner un ID libre !"
 
@@ -1702,7 +1714,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1823,7 +1835,7 @@ msgstr "Arguments"
 msgid "Search in subtrees"
 msgstr "Chercher dans les sous arbre"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1831,29 +1843,29 @@ msgstr ""
 "Cet objet à changer depuis son ouverture dans GOsa. Tout les changement "
 "éffectués par les autres seront perdus si vous sauvez cette entrée !"
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr "Changement du dn de l'acl"
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr "vers"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr "Restaurer"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "couper"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "copier"
 
@@ -2085,7 +2097,8 @@ msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
 #: include/utils/class_msgPool.inc:226
 #, 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/utils/class_msgPool.inc:228
 #, php-format
@@ -2159,8 +2172,8 @@ msgstr "Extension PHP %s manquante !"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2202,7 +2215,8 @@ msgstr "Ce compte n'a pas d'extensions %s valides !"
 
 #: include/utils/class_msgPool.inc:386
 #, php-format
-msgid "This account has %s settings enabled. You can disable them by clicking below."
+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."
@@ -2218,7 +2232,8 @@ msgstr ""
 
 #: include/utils/class_msgPool.inc:405
 #, php-format
-msgid "This account has %s settings disabled. You can enable them by clicking below."
+msgid ""
+"This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 "Ce compte possède %s paramètres desactivés. Vous pouvez les activer en "
 "clicquant ci dessous."
@@ -2453,8 +2468,11 @@ msgstr ""
 "extension dans votre installation de GOsa ?"
 
 #: include/utils/class_msgPool.inc:578
-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 !"
+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 !"
 
 #: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
@@ -2469,7 +2487,8 @@ msgstr ""
 
 #: include/class_ldap.inc:693
 #, php-format
-msgid "Cannot automatically create subtrees with RDN '%s': no object class found!"
+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é !"
@@ -2491,7 +2510,12 @@ msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2500,7 +2524,7 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2580,7 +2604,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -2632,10 +2656,10 @@ msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Informations"
@@ -2648,7 +2672,7 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Messagerie"
@@ -2656,14 +2680,14 @@ msgstr "Messagerie"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr ""
 
@@ -2693,8 +2717,8 @@ msgstr "Groupes"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Département"
 
@@ -2702,14 +2726,14 @@ msgstr "Département"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Téléphone"
@@ -2835,8 +2859,8 @@ msgstr "Utilisateur"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2844,7 +2868,7 @@ msgstr "Utilisateur"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2876,10 +2900,10 @@ msgstr "Utilisateur"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2909,13 +2933,13 @@ msgstr "Nom"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3009,9 +3033,9 @@ msgstr ""
 "groupe d'objet !"
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "aucun"
 
@@ -3162,7 +3186,7 @@ msgstr "Sommaire FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3331,25 +3355,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Prénom"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Nom de famille"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr "Edition multiple"
 
@@ -3495,7 +3519,8 @@ msgstr "! identifiant inconnu"
 #: plugins/admin/groups/class_group.inc:667
 #, 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:894
 #, php-format
@@ -3561,19 +3586,19 @@ msgid "Edit posix properties"
 msgstr "Modifier les propriétés posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
@@ -3589,7 +3614,7 @@ msgid "Edit start menu properties"
 msgstr "Modifier les propriétes du menu de démarrage"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
@@ -3624,15 +3649,15 @@ msgstr ""
 "Changer le mot de passe affecte votre identification sur la messagerie, le "
 "proxy, samba, et les services unix."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Confirmation du nouveau mot de passe"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr "Sécurité"
 
@@ -3646,26 +3671,26 @@ msgstr "Saisie du mot de passe"
 msgid "Use proposal"
 msgstr "Proposition"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 msgid "Manually specify a password"
 msgstr "Choisir un mot de passe"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 msgid "Enforce password change on next login."
 msgstr "Forcer le changement de mot de passe a la prochaine connexion."
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Attribuer le mot de passe"
 
@@ -3684,18 +3709,18 @@ msgstr ""
 "Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Modèle"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Prénom"
@@ -3704,38 +3729,38 @@ msgstr "Prénom"
 msgid "Manage users"
 msgstr "Gèrer les utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 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 !"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, 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é !"
+"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:856
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Lock account"
 msgstr "Verrouiller Compte"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3743,19 +3768,19 @@ msgstr "Modifier les propriétés de base"
 msgid "POSIX"
 msgstr "UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 msgid "Edit POSIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Modifier les propriétés de Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 msgid "Edit FAX properties"
 msgstr "Modifier les propriétés FAX"
 
@@ -3883,8 +3908,8 @@ msgstr "Lieu"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Entreprise"
 
@@ -3916,11 +3941,11 @@ msgstr "Description du département"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 msgid "Manager"
 msgstr "Responsable"
 
@@ -3934,7 +3959,7 @@ msgstr "Responsable"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Paramètres administratifs"
@@ -3962,7 +3987,7 @@ msgstr "Description du département"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Catégorie"
@@ -3976,20 +4001,20 @@ msgstr "Catégorie pour cette branche de l'annuaire"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Lieu"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Département"
 
@@ -4004,10 +4029,10 @@ msgid "Location of this subtree"
 msgstr "Lieu de cette branche"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Adresse"
 
@@ -4024,12 +4049,12 @@ msgstr "Numéro de téléphone de base pour cette sous-branche"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr ""
 
@@ -4047,8 +4072,8 @@ msgid "Domain Component"
 msgstr "Objet Domaine"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Départements"
 
@@ -4071,7 +4096,7 @@ msgid "Organization name"
 msgstr "Nom de l'entreprise"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Adresse postale"
 
@@ -4102,40 +4127,40 @@ msgstr ""
 "Impossible de trouver un marqueur libre pour marquer l'entité "
 "administrative !"
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Marquer '%s'."
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Bouger '%s' vers '%s'"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, 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:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Nom du département"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "L'objet '%s' est déjà marqué"
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Ajouter une marque (%s) à l'objet '%s'"
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Suppression de la marque de l'objet '%s'"
@@ -4239,12 +4264,13 @@ msgstr "Objet utilisé"
 #: plugins/admin/acl/class_aclRole.inc:646
 #, 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:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Rôle"
 
@@ -4333,207 +4359,214 @@ msgstr ""
 "Le format de stockage sélectionné pour les mots de passe n'est plus "
 "disponible."
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 "Impossible de construire le RDN: pas de + autorisé dans la construction d'un "
 "sous RDN !"
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 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:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 "Imposible de contruire un RDN: les paramètres de l'attribut sont non "
 "valides !"
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 msgid "The selected password method requires initial configuration!"
-msgstr "Le format de stockage sélectionné nécessite une configuration de base !"
+msgstr ""
+"Le format de stockage sélectionné nécessite une configuration de base !"
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr "Impossible d'ouvrir le certificat !"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Identifiant du bâtiment"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Mon Compte"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 msgid "Login restrictions"
 msgstr "Restriction de connexions"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 msgid "User password method"
 msgstr "Méthode d'encodage des mots de passe"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 msgid "Entries differ"
 msgstr "Les entrées sont différentes"
 
@@ -4550,72 +4583,71 @@ msgstr ""
 msgid "Personal information"
 msgstr "Informations personnelles"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Image personnelle"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Changer la photo"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Format de stockage des mots de passe"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Editer des certificats"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr "Restreindre le login à"
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr "IP ou réseau"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
@@ -4656,8 +4688,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Changement de mot de passe"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Effacer les données dans les champs"
 
@@ -4676,7 +4708,8 @@ msgstr "Certificat PKCS12"
 #: plugins/personal/generic/nochange.tpl:2
 #: plugins/personal/password/nochange.tpl: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/generic/nochange.tpl:5
 msgid "Your password hash method will not be changed!"
@@ -4757,7 +4790,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4790,53 +4823,53 @@ msgstr ""
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr "Compte Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr "ID du Groupe"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr "Forcer le changement de mot de passe au la connexion"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
 msgstr "nb minimal entre changements"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr "Max valid time"
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr "Clef SSH publique"
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr "Système de Confiance"
 
@@ -4934,7 +4967,8 @@ msgstr "Paramètres Posix"
 
 #: plugins/personal/posix/posix_shadow.tpl:9
 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/posix_shadow.tpl:34
 msgid "Password expires on"
@@ -4952,22 +4986,21 @@ msgstr "Votre mot de passe à expiré. Choisissez un nouveau mot de passe !"
 msgid "Change user password"
 msgstr "Modifier votre mot de passe"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 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:144
+#: plugins/personal/password/class_password.inc:140
 #, php-format
-msgid "External password changer reported a problem: %s."
+msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
-"Le programme externe pour changer votre mot de passe à renvoyé une erreur: %"
-"s."
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
@@ -4975,11 +5008,11 @@ msgstr ""
 "Le mot de passe entré comme mot de passe actuel ne correspond pas à votre "
 "mot de passe."
 
-#: plugins/personal/password/class_password.inc:164
+#: plugins/personal/password/class_password.inc:167
 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:201
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr "Mot de passe"
 
@@ -5052,7 +5085,8 @@ msgid "Please specify a valid email address."
 msgstr "Veuillez indiquer une adresse de messagerie valide."
 
 #: setup/class_setupStep_Feedback.inc:185
-msgid "You have to select at least one of both options, subscribe or send feedback."
+msgid ""
+"You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
 "Vous devez au moins avoir activé une option, souscrire ou envoyer votre "
 "retour d'information."
@@ -5443,7 +5477,8 @@ 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"
@@ -5474,7 +5509,8 @@ msgstr "GOsa à besoin de ce module pour dialoger avec Samba."
 msgid ""
 "GOsa requires either 'mhash' or the 'sha1' module to make use of SSHA "
 "encryption."
-msgstr "GOsa à besoin du module 'mash' ou 'sha1' pour l'utilisation du cryptage SSHA."
+msgstr ""
+"GOsa à besoin du module 'mash' ou 'sha1' pour l'utilisation du cryptage SSHA."
 
 #: setup/class_setupStep_Checks.inc:105
 msgid "GOsa requires this module to talk to an IMAP server."
@@ -5486,14 +5522,16 @@ msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "GOsa requires this module to handle unicode strings."
-msgstr "GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
+msgstr ""
+"GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
 
 #: setup/class_setupStep_Checks.inc:120
 msgid "MySQL"
 msgstr "MySQL"
 
 #: setup/class_setupStep_Checks.inc:121
-msgid "GOsa requires this module to communicate with several supported databases."
+msgid ""
+"GOsa requires this module to communicate with several supported databases."
 msgstr ""
 "GOsa à besion de ce module pour dialoguer avec les bases de données "
 "supportées."
@@ -5509,7 +5547,8 @@ msgstr ""
 "mots de passe Samba."
 
 #: setup/class_setupStep_Checks.inc:140
-msgid "Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
+msgid ""
+"Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
 msgstr ""
 "Déployez une installation gosa-si ou installer les modules perl Crypt::"
 "Smbash."
@@ -5595,7 +5634,8 @@ msgstr ""
 "mémoire pour les installations plus complexes."
 
 #: setup/class_setupStep_Checks.inc:209
-msgid "Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 "Recherchez pour 'memory_limit' dans votre php.ini et mettez le à '32M' or "
 "plus haut."
@@ -5617,7 +5657,8 @@ msgid "The Execution time should be at least 30 seconds."
 msgstr "Le temps d'exécution doit être au moins de 30 secondes."
 
 #: setup/class_setupStep_Checks.inc:225
-msgid "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+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."
@@ -5659,7 +5700,8 @@ msgstr ""
 "'off'."
 
 #: setup/class_setupStep_Checks.inc:249
-msgid "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+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'."
@@ -5994,7 +6036,8 @@ msgstr "DN de l'administrateur"
 
 #: setup/setup_ldap.tpl:86
 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:93
 msgid "Admin password"
@@ -6126,10 +6169,11 @@ msgstr "Echec"
 
 #: setup/class_setupStep_Migrate.inc:375
 #, php-format
-msgid "Found %s winstations outside the predefined winstation department ou '%s'."
+msgid ""
+"Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
-"J'ai trouvé %s winstations en dehors du département winstation prédéfini '%"
-"s'."
+"J'ai trouvé %s winstations en dehors du département winstation prédéfini "
+"'%s'."
 
 #: setup/class_setupStep_Migrate.inc:448
 #, php-format
@@ -6147,8 +6191,10 @@ msgstr "J'ai trouvé %s utilsateur(s) en dehors de la branche configurée '%s'."
 
 #: setup/class_setupStep_Migrate.inc:585 setup/class_setupStep_Migrate.inc:598
 #, 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."
+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."
 
 #: setup/class_setupStep_Migrate.inc:662
 #, php-format
@@ -6177,7 +6223,8 @@ msgstr "Compte administratifs de GOsa 2.5 trouvés : %s"
 
 #: setup/class_setupStep_Migrate.inc:1034
 msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
-msgstr "Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
+msgstr ""
+"Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
 
 #: setup/class_setupStep_Migrate.inc:1051
 msgid "There is no GOsa administrator account inside your LDAP."
@@ -6214,7 +6261,8 @@ msgstr "Le nom d'utilisateur est incorrect !"
 #: setup/class_setupStep_Migrate.inc:1201
 #, 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 !"
+msgstr ""
+"L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
 
 #: setup/class_setupStep_Migrate.inc:1240
 #: setup/class_setupStep_Migrate.inc:1289
@@ -6244,7 +6292,8 @@ msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
 #: setup/class_setupStep_Migrate.inc:1991
-msgid "The LDAP root object is missing. It is required to use your LDAP service."
+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."
@@ -6464,7 +6513,8 @@ msgstr "Compresser les données envoyées au navigateur web"
 
 #: setup/setup_config1.tpl:27
 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"
 
 #: setup/setup_config1.tpl:30
 msgid "People DN attribute"
@@ -6677,3 +6727,7 @@ msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 msgid "Automatic"
 msgstr "Automatique"
 
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr ""
+#~ "Le programme externe pour changer votre mot de passe à renvoyé une "
+#~ "erreur: %s."
diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
index 2374a3ded..96d4c6b50 100644
--- a/gosa-core/locale/core/it/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +20,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -270,12 +271,12 @@ msgstr "Password"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nuova password"
 
@@ -334,7 +335,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Oggetto"
 
@@ -375,26 +376,27 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Continua"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -420,12 +422,13 @@ msgstr "Continua"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -473,15 +476,9 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 #, fuzzy
 msgid "Password change"
 msgstr "Cambia la password"
@@ -508,9 +505,9 @@ msgstr "Nuova password"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 #, fuzzy
 msgid "Password strength"
 msgstr "Algorimo password"
@@ -632,8 +629,8 @@ msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -664,18 +661,18 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr ""
 "La password immessa come 'Nuova password' è troppo simile a quella attuale."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
@@ -683,11 +680,11 @@ msgstr "La 'Nuova password' immessa è troppo corta."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Nome utente"
@@ -742,34 +739,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -842,8 +839,8 @@ msgstr "Scarica il file di  configurazione"
 
 #: html/main.php:168
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 
 #: html/main.php:198
@@ -866,7 +863,7 @@ msgstr "Ricerca"
 
 #: html/main.php:374
 #, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
 #: html/main.php:388
@@ -877,8 +874,8 @@ msgstr "File di configurazione"
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -918,31 +915,31 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non hai il permesso di cambiare la tua password."
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non hai il permesso di cambiare la tua password."
@@ -968,7 +965,7 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -1036,7 +1033,7 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Utenti"
@@ -1049,20 +1046,20 @@ msgstr "Gruppi di utenti"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1082,7 +1079,7 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1157,8 +1154,8 @@ msgstr "Gruppo di oggetti"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1268,30 +1265,30 @@ msgid "Actions"
 msgstr "Azioni"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 #, fuzzy
 msgid "Copy"
 msgstr "Azienda"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 #, fuzzy
 msgid "Cut"
 msgstr "Esegui"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 #, fuzzy
 msgid "Paste"
 msgstr "Data"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
@@ -1307,25 +1304,30 @@ msgid "Export list"
 msgstr "Esporta"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Gruppo di oggetti"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Esporta"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
@@ -1394,7 +1396,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Configura"
 
@@ -1425,195 +1427,195 @@ msgstr ""
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "Utenti di Dominio"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, fuzzy, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "versione di sviluppo di GOsa (Rev %s)"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "versione di sviluppo di GOsa (Rev %s)"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Rimuovi"
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Amministrazione LDAP"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Lista dei dipartimenti"
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Tedesco"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Francese"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Inglese"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 #, fuzzy
 msgid "Polish"
 msgstr "Inglese"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 #, fuzzy
 msgid "Chinese"
 msgstr "reset"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Nome"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Vai al dipartimento base"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
@@ -1675,7 +1677,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1797,39 +1799,39 @@ msgstr "Argomenti"
 msgid "Search in subtrees"
 msgstr "Seleziona per mostrare le applicazioni"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 #, fuzzy
 msgid "from"
 msgstr "e"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 #, fuzzy
 msgid "to"
 msgstr "Rapporto"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 #, fuzzy
 msgid "Restore"
 msgstr "Riprova"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 #, fuzzy
 msgid "cut"
 msgstr "Esegui"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr ""
 
@@ -2151,8 +2153,8 @@ msgstr "Elimina foto"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2483,14 +2485,19 @@ msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, 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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2569,7 +2576,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr ""
 
@@ -2622,10 +2629,10 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Generale"
@@ -2638,7 +2645,7 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Posta"
@@ -2646,14 +2653,14 @@ msgstr "Posta"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "FAX"
 
@@ -2683,8 +2690,8 @@ msgstr "Gruppo"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -2692,14 +2699,14 @@ msgstr "Dipartimento"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefono"
@@ -2827,8 +2834,8 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2836,7 +2843,7 @@ msgstr ""
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2868,10 +2875,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2901,13 +2908,13 @@ msgstr "Cognome"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3008,9 +3015,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "nessuno"
 
@@ -3165,7 +3172,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3346,25 +3353,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Nome"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Cognome"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3590,21 +3597,21 @@ msgid "Edit posix properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 #, fuzzy
 msgid "Edit phone properties"
@@ -3623,7 +3630,7 @@ msgid "Edit start menu properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 #, fuzzy
 msgid "Edit environment properties"
@@ -3652,15 +3659,15 @@ msgstr ""
 "Cambiare la passord influisce sull'autenticazione su posta, proxu Internet, "
 "Samba e Unix."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Ripeti la password"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 #, fuzzy
 msgid "Strength"
 msgstr "Strada"
@@ -3677,29 +3684,29 @@ msgstr "Password"
 msgid "Use proposal"
 msgstr "gruppi"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 #, fuzzy
 msgid "Refresh"
 msgstr "Riferimenti"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Cambia la password"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Cambia password"
 
@@ -3715,19 +3722,19 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 #, fuzzy
 msgid "Last name"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 #, fuzzy
 msgid "First name"
@@ -3738,39 +3745,39 @@ msgstr "Liste di blocco"
 msgid "Manage users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Account locking"
 msgstr "Sicurezza"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "Identità"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "Identità"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3778,21 +3785,21 @@ msgstr "Modifica proprietà"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 #, fuzzy
 msgid "Edit netatalk properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Modifica proprietà"
@@ -3927,8 +3934,8 @@ msgstr "Località"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Organizzazione"
 
@@ -3961,11 +3968,11 @@ msgstr ""
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Utenti di Dominio"
@@ -3980,7 +3987,7 @@ msgstr "Utenti di Dominio"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 #, fuzzy
 msgid "Administrative settings"
@@ -4010,7 +4017,7 @@ msgstr "Nome descrittivo del gruppo"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr ""
@@ -4024,20 +4031,20 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Località"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Stato"
 
@@ -4052,10 +4059,10 @@ msgid "Location of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -4072,12 +4079,12 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Fax"
 
@@ -4096,8 +4103,8 @@ msgid "Domain Component"
 msgstr "Amministratori di Dominio"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Dipartimenti"
 
@@ -4119,7 +4126,7 @@ msgid "Organization name"
 msgstr "Organizzazione"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "CAP"
 
@@ -4150,41 +4157,41 @@ msgstr ""
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 #, fuzzy
 msgid "Department name"
 msgstr "Dipartimento"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Telefono"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4297,8 +4304,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Ruolo"
 
@@ -4385,219 +4392,225 @@ msgstr "Non ci sono certificati installati"
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Data di nascita"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Unità"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Identificativo della casa"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Località personale"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Descrizoione unità"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Funzione"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Pubblico"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Strada"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Identità"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Titolo di studio"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Sesso"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "La password spira il"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 #, fuzzy
 msgid "Room number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 #, fuzzy
 msgid "Pager number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 #, fuzzy
 msgid "User certificates"
 msgstr "Certificato standard"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "Gruppo di utenti"
@@ -4615,73 +4628,72 @@ msgstr ""
 msgid "Personal information"
 msgstr "Informazioni personali"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Cambia foto"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 #, fuzzy
 msgid "Template name"
 msgstr "Template"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Telefono privato"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificati"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Modifica certificati"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Matricola"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Usa il tab del telefono"
 
@@ -4726,8 +4738,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Cambia la password"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Ripulisci i campi"
 
@@ -4831,7 +4843,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4867,60 +4879,60 @@ msgstr "Mostra workstation"
 msgid "shadowInactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 #, fuzzy
 msgid "POSIX account"
 msgstr "Estenzioni FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Cambia la password"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 #, fuzzy
 msgid "Shadow min"
 msgstr "Mostra terminali"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Mostra workstation"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostra persone"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 #, fuzzy
 msgid "System trust model"
 msgstr "Accesso ai sistemi"
@@ -5045,31 +5057,31 @@ msgstr "Non hai il permesso di cambiare la tua password."
 msgid "Change user password"
 msgstr "Cambia la password"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: plugins/personal/password/class_password.inc:144
-#, fuzzy, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
+#: plugins/personal/password/class_password.inc:140
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 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:164
+#: plugins/personal/password/class_password.inc:167
 #, fuzzy
 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:201
+#: plugins/personal/password/class_password.inc:204
 #, fuzzy
 msgid "User password"
 msgstr "Nuova password"
@@ -6834,6 +6846,10 @@ msgstr "Lingua preferita"
 msgid "Automatic"
 msgstr "automatico"
 
+#, fuzzy
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "Membri del gruppo"
diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po
index e5b393b27..83cb534de 100644
--- a/gosa-core/locale/core/messages.po
+++ b/gosa-core/locale/core/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +21,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -255,12 +256,12 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr ""
 
@@ -316,7 +317,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr ""
 
@@ -355,26 +356,27 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -400,12 +402,13 @@ msgstr ""
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -451,15 +454,9 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr ""
 
@@ -484,9 +481,9 @@ msgstr ""
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 msgid "Password strength"
 msgstr ""
 
@@ -603,8 +600,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -633,17 +630,17 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr ""
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr ""
 
@@ -651,11 +648,11 @@ msgstr ""
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr ""
@@ -708,34 +705,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -802,8 +799,8 @@ msgstr ""
 
 #: html/main.php:168
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 
 #: html/main.php:198
@@ -824,7 +821,7 @@ msgstr ""
 
 #: html/main.php:374
 #, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
 #: html/main.php:388
@@ -834,8 +831,8 @@ msgstr ""
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -874,29 +871,29 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr ""
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr ""
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -922,7 +919,7 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -985,7 +982,7 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr ""
@@ -998,19 +995,19 @@ msgstr ""
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr ""
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1030,7 +1027,7 @@ msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1097,8 +1094,8 @@ msgstr ""
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1199,26 +1196,26 @@ msgid "Actions"
 msgstr ""
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr ""
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr ""
 
@@ -1231,23 +1228,27 @@ msgid "Export list"
 msgstr ""
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+msgid "Sortable list"
+msgstr ""
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr ""
 
@@ -1311,7 +1312,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr ""
 
@@ -1340,188 +1341,188 @@ msgstr ""
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, php-format
 msgid "GOsa %s"
 msgstr ""
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -1581,7 +1582,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1696,35 +1697,35 @@ msgstr ""
 msgid "Search in subtrees"
 msgstr ""
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr ""
 
@@ -2026,8 +2027,8 @@ msgstr ""
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2342,14 +2343,19 @@ msgstr ""
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, 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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2421,7 +2427,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr ""
 
@@ -2473,10 +2479,10 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
@@ -2489,7 +2495,7 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr ""
@@ -2497,14 +2503,14 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr ""
 
@@ -2534,8 +2540,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr ""
 
@@ -2543,14 +2549,14 @@ msgstr ""
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr ""
@@ -2670,8 +2676,8 @@ msgstr ""
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2679,7 +2685,7 @@ msgstr ""
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2711,10 +2717,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2744,13 +2750,13 @@ msgstr ""
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -2839,9 +2845,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr ""
 
@@ -2990,7 +2996,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3156,25 +3162,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr ""
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3380,19 +3386,19 @@ msgid "Edit posix properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr ""
@@ -3408,7 +3414,7 @@ msgid "Edit start menu properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr ""
@@ -3434,15 +3440,15 @@ msgid ""
 "and unix services."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr ""
 
@@ -3456,26 +3462,26 @@ msgstr ""
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 msgid "Refresh"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 msgid "Manually specify a password"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 msgid "Enforce password change on next login."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr ""
 
@@ -3491,18 +3497,18 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr ""
@@ -3511,34 +3517,34 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3546,19 +3552,19 @@ msgstr ""
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 msgid "Edit POSIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 msgid "Edit FAX properties"
 msgstr ""
 
@@ -3678,8 +3684,8 @@ msgstr ""
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr ""
 
@@ -3711,11 +3717,11 @@ msgstr ""
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 msgid "Manager"
 msgstr ""
 
@@ -3729,7 +3735,7 @@ msgstr ""
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr ""
@@ -3757,7 +3763,7 @@ msgstr ""
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr ""
@@ -3771,20 +3777,20 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr ""
 
@@ -3799,10 +3805,10 @@ msgid "Location of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr ""
 
@@ -3819,12 +3825,12 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr ""
 
@@ -3842,8 +3848,8 @@ msgid "Domain Component"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr ""
 
@@ -3863,7 +3869,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr ""
 
@@ -3892,40 +3898,40 @@ msgstr ""
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4027,8 +4033,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr ""
 
@@ -4109,203 +4115,209 @@ msgstr ""
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 msgid "Login restrictions"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 msgid "Entries differ"
 msgstr ""
 
@@ -4320,72 +4332,71 @@ msgstr ""
 msgid "Personal information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -4423,8 +4434,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr ""
 
@@ -4518,7 +4529,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4551,53 +4562,53 @@ msgstr ""
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr ""
 
@@ -4713,30 +4724,30 @@ msgstr ""
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:144
+#: plugins/personal/password/class_password.inc:140
 #, php-format
-msgid "External password changer reported a problem: %s."
+msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:164
+#: plugins/personal/password/class_password.inc:167
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr ""
 
diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
index 8f0a6e767..52af93055 100644
--- a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,8 +24,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -285,12 +286,12 @@ msgstr "Oud wachtwoord"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
@@ -350,7 +351,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Object"
 
@@ -393,26 +394,27 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Doorgaan"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -438,12 +440,13 @@ msgstr "Doorgaan"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -491,15 +494,9 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 #, fuzzy
 msgid "Password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
@@ -526,9 +523,9 @@ msgstr "Nieuw wachtwoord"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 #, fuzzy
 msgid "Password strength"
 msgstr "Wachtwoord encryptie"
@@ -667,8 +664,8 @@ msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -700,7 +697,7 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -708,12 +705,12 @@ msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen."
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr ""
 "Het huidige wachtwoord en het nieuwe wachtwoord lijken te veel op elkaar."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
@@ -721,11 +718,11 @@ msgstr "Het nieuw opgegeven wachtwoord is te kort."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Inlognaam"
@@ -780,34 +777,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -884,9 +881,10 @@ msgid "PHP configuration"
 msgstr "FAX database"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "FATAAL: 'Register globals' is geactiveerd in PHP. GOsa zal niemand laten "
 "inloggen totdat dit opgelost is door een systeembeheerder."
@@ -911,7 +909,7 @@ msgstr "in"
 
 #: html/main.php:374
 #, fuzzy, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "FATAAL: Kan geen enkele module defenities vinden voor module '%s'!"
 
 #: html/main.php:388
@@ -922,8 +920,8 @@ msgstr "Configuratie bestand"
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -965,31 +963,31 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
@@ -1015,7 +1013,7 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -1084,7 +1082,7 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Gebruikers"
@@ -1097,19 +1095,19 @@ msgstr "Groepen"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Omhoog"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Omlaag"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1129,7 +1127,7 @@ msgid "ACL"
 msgstr "Rechten"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1203,8 +1201,8 @@ msgstr "Nieuw FAI object aanmaken"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1314,28 +1312,28 @@ msgid "Actions"
 msgstr "Acties"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 #, fuzzy
 msgid "Copy"
 msgstr "kopieer"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 #, fuzzy
 msgid "Cut"
 msgstr "knippen"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
@@ -1350,25 +1348,30 @@ msgid "Export list"
 msgstr "Exporteer"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Exporteer"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
@@ -1442,7 +1445,7 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Instellen"
 
@@ -1471,147 +1474,147 @@ msgstr "Regels per pagina"
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "Log DB gebruiker"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, fuzzy, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP beheer"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kan de schema informatie niet ophalen van de server. Schema controle is "
 "onmogelijk!"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Toon FAI sjabloon objecten"
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Duits"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Frans"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italiaans"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Spaans"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Engels"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Pools"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 #, fuzzy
 msgid "Chinese"
 msgstr "Chipset"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Naam"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1619,53 +1622,53 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 #, fuzzy
 msgid "no ID available!"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr ""
@@ -1730,7 +1733,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1855,38 +1858,38 @@ msgstr "Argumenten"
 msgid "Search in subtrees"
 msgstr "Zoek binnen subtree"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 #, fuzzy
 msgid "Restore"
 msgstr "Opnieuw proberen"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "knippen"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "kopieer"
 
@@ -2214,8 +2217,8 @@ msgstr "Verwijder printer mogelijkheden"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2550,7 +2553,12 @@ msgstr "bij het bewerken van '%s' op LDAP server '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2559,7 +2567,7 @@ 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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2641,7 +2649,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -2694,10 +2702,10 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Algemeen"
@@ -2710,7 +2718,7 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "E-mail"
@@ -2718,14 +2726,14 @@ msgstr "E-mail"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "Fax"
 
@@ -2755,8 +2763,8 @@ msgstr "Groep"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Afdeling"
 
@@ -2764,14 +2772,14 @@ msgstr "Afdeling"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefoon"
@@ -2898,8 +2906,8 @@ msgstr "Gebruiker"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2907,7 +2915,7 @@ msgstr "Gebruiker"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2939,10 +2947,10 @@ msgstr "Gebruiker"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2972,13 +2980,13 @@ msgstr "Naam"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3082,9 +3090,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "geen"
 
@@ -3239,7 +3247,7 @@ msgstr "FAI samenvatting"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3421,25 +3429,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Naam"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Achternaam"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3666,19 +3674,19 @@ msgid "Edit posix properties"
 msgstr "Bewerk telefoon eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
@@ -3696,7 +3704,7 @@ msgid "Edit start menu properties"
 msgstr "Bewerk Samba eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
@@ -3730,15 +3738,15 @@ msgstr ""
 "Het veranderen van het wachtwoord is van invloed op E-mail, proxy, samba en "
 "Unix diensten."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Herhaal het nieuwe wachtwoord"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 #, fuzzy
 msgid "Strength"
 msgstr "Straat"
@@ -3755,29 +3763,29 @@ msgstr "Wachtwoord"
 msgid "Use proposal"
 msgstr "groepen"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 #, fuzzy
 msgid "Refresh"
 msgstr "Referenties"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "Geef a.u.b. uw wachtwoord op!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Wachtwoord instellen"
 
@@ -3796,18 +3804,18 @@ msgstr ""
 "gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Sjabloon"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Achternaam"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Voornaam"
@@ -3817,38 +3825,38 @@ msgstr "Voornaam"
 msgid "Manage users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Account locking"
 msgstr "Account"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3856,20 +3864,20 @@ msgstr "Bewerk algemene eigenschappen"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Bewerk Netatalk eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Bewerk UNIX eigenschappen"
@@ -4010,8 +4018,8 @@ msgstr "Plaats"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Organisatie"
 
@@ -4045,11 +4053,11 @@ msgstr "Omschrijving voor de afdeling"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Windows gebruikers"
@@ -4064,7 +4072,7 @@ msgstr "Windows gebruikers"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Administratieve instellingen"
@@ -4093,7 +4101,7 @@ msgstr "Omschrijving voor de afdeling"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Categorie"
@@ -4107,20 +4115,20 @@ msgstr "Categorie voor deze subtree"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Plaats"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Provincie"
 
@@ -4135,10 +4143,10 @@ msgid "Location of this subtree"
 msgstr "Plaats van deze subtree"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Adres"
 
@@ -4155,12 +4163,12 @@ msgstr "Basis telefoonnummer van deze subtree"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Fax"
 
@@ -4179,8 +4187,8 @@ msgid "Domain Component"
 msgstr "Windows beheerders"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Afdelingen"
 
@@ -4202,7 +4210,7 @@ msgid "Organization name"
 msgstr "Organisatie"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Adres thuis"
 
@@ -4238,40 +4246,40 @@ msgstr ""
 "Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
 "eenheid te markeren!"
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Markeren van '%s'."
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Verplaatsen van %s naar %s"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Afdelingnaam"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Object '%s' is al gemarkeerd"
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Toevoegen van markering (%s) aan object '%s'"
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Verwijderen van markering van object '%s'"
@@ -4387,8 +4395,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Funktie"
 
@@ -4476,219 +4484,225 @@ msgstr "Geen certificaat geinstalleerd"
 msgid "The selected password method is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Mijn account"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Geslacht"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "Wachtwoord verloopt op"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "Regels per pagina"
@@ -4706,72 +4720,71 @@ msgstr ""
 msgid "Personal information"
 msgstr "Persoonlijke informatie"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Verander plaatje"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Sjabloon naam"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Telefoon privé"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Bewerk certificaten"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Gebruik a.u.b. de telefoon tab"
 
@@ -4813,8 +4826,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Wis velden"
 
@@ -4916,7 +4929,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4953,61 +4966,61 @@ msgstr "Schaduwen van andere sessie"
 msgid "shadowInactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI account"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 #, fuzzy
 msgid "Shadow min"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 #, fuzzy
 msgid "Shadow max"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Toon personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 #, fuzzy
 msgid "System trust model"
 msgstr "Systeem vertrouwen"
@@ -5131,20 +5144,20 @@ msgstr "Uw wachtwoord is verlopen! Kies a.u.b. een nieuw wachtwoord. "
 msgid "Change user password"
 msgstr "Verander wachtwoord"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
-#: plugins/personal/password/class_password.inc:144
-#, fuzzy, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
+#: plugins/personal/password/class_password.inc:140
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
@@ -5152,12 +5165,12 @@ msgstr ""
 "Het wachtwoord dat u opgegeven heeft als uw huidige wachtwoord is niet "
 "correct."
 
-#: plugins/personal/password/class_password.inc:164
+#: plugins/personal/password/class_password.inc:167
 #, fuzzy
 msgid "You have no permission to change your password."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 #, fuzzy
 msgid "User password"
 msgstr "Wachtwoord wissen"
@@ -6949,6 +6962,10 @@ msgstr ""
 msgid "Automatic"
 msgstr "automatisch"
 
+#, fuzzy
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "Groepsleden"
diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
index 53f3cfd6a..f615cab0e 100644
--- a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2009-09-05 15:13+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -274,12 +275,12 @@ msgstr "Stare hasło"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nowe hasło"
 
@@ -338,7 +339,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Obiekt"
 
@@ -379,26 +380,27 @@ msgstr "Przyczyna utworzenia tego snapshot'u"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Kontynuuj"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -424,12 +426,13 @@ msgstr "Kontynuuj"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -475,15 +478,9 @@ msgid "Your password has been changed successfully."
 msgstr "Twoje hasło zostało pomyślnie zmienione."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr "Zmiana hasła"
 
@@ -509,9 +506,9 @@ msgstr "Nowe hasło"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 #, fuzzy
 msgid "Password strength"
 msgstr "Przechowywanie hasła"
@@ -641,8 +638,8 @@ msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -672,17 +669,17 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 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/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "Hasło podane jako nowe jest zbyt podobne do obecnego."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
@@ -690,11 +687,11 @@ msgstr "Hasło podane jako nowe jest za krótkie."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Login"
@@ -747,34 +744,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -846,9 +843,10 @@ msgid "PHP configuration"
 msgstr "Konfiguracja PHP"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "BŁĄD: Register globals jest włączone. GOsa odmówi logowania do momentu "
 "poprawienia tego parametru przez administratora."
@@ -872,7 +870,7 @@ msgstr "Dodatek"
 
 #: html/main.php:374
 #, fuzzy, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "BŁĄD: Nie można znaleźć żadnych definicji dla pluginu '%s'!"
 
 #: html/main.php:388
@@ -882,8 +880,8 @@ msgstr "Błąd konfiguracji"
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -925,30 +923,30 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr "Uprawnienie"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Brak uprawnień do zmiany przekazywania poczty"
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Brak uprawnień do zmiany przekazywania poczty"
@@ -974,7 +972,7 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -1042,7 +1040,7 @@ msgid "Use ACL defined in role"
 msgstr "Użyj ACL zdefiniowanego w tej roli"
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Użytkownicy"
@@ -1055,19 +1053,19 @@ msgstr "Grupy"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Góra"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "W dół"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1087,7 +1085,7 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1158,8 +1156,8 @@ msgstr "Utwórz obiekty"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1266,26 +1264,26 @@ msgid "Actions"
 msgstr "Akcje"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr "Kopiuj"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr "Wytnij"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
@@ -1300,23 +1298,28 @@ msgid "Export list"
 msgstr "Export"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Export"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Edytuj ten obiekt"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Usuń ten obiekt"
 
@@ -1389,7 +1392,7 @@ msgstr ""
 "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
 "przekroczony"
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Konfiguruj"
 
@@ -1418,195 +1421,195 @@ msgstr "Wpisów na stronie"
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "Usługa Logowania"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, fuzzy, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "Wersja deweloperska GOsa (Rev %s)"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Wersja deweloperska GOsa (Rev %s)"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Plik '%s' nie mógł zostać usunięty."
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Nie można pobrać informacji o schematach z serwera. Sprawdzenie schematów "
 "niemożliwe!"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Wyświetl szablony FAI"
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Brak opcjonalnego obiektu klasy '%s'!"
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Plik jest dostępny"
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Niemiecki"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Francuski"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Włoski"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Angielski"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Polski"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr "Chińsski"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, 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:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Utwórz nowy departament"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 #, fuzzy
 msgid "no ID available!"
 msgstr "Brak szablonów!"
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
@@ -1669,7 +1672,7 @@ msgstr "Y-m-d, H:i:s"
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1789,35 +1792,35 @@ msgstr "Argumenty"
 msgid "Search in subtrees"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "od"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr "do"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr "Odtwórz"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "wytnij"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "kopiuj"
 
@@ -2139,8 +2142,8 @@ msgstr "Rozszerzenie inwentarza"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2469,7 +2472,12 @@ msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2478,7 +2486,7 @@ msgstr ""
 "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
 "'dn: ...' w linii %s"
 
-#: include/class_ldap.inc:1084
+#: include/class_ldap.inc:1081
 #, php-format
 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 !"
@@ -2555,7 +2563,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Nieznane"
 
@@ -2607,10 +2615,10 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Ogólne"
@@ -2623,7 +2631,7 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Poczta"
@@ -2631,14 +2639,14 @@ msgstr "Poczta"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "FAX"
 
@@ -2668,8 +2676,8 @@ msgstr "Grupa"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Departament"
 
@@ -2677,14 +2685,14 @@ msgstr "Departament"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefon"
@@ -2810,8 +2818,8 @@ msgstr "Użytkownik"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2819,7 +2827,7 @@ msgstr "Użytkownik"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2851,10 +2859,10 @@ msgstr "Użytkownik"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2884,13 +2892,13 @@ msgstr "Imię"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -2991,9 +2999,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "żaden"
 
@@ -3144,7 +3152,7 @@ msgstr "Podsumowanie FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3325,25 +3333,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Imię"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Nazwisko"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3559,19 +3567,19 @@ msgid "Edit posix properties"
 msgstr "Edytuj właściwości Telefonu"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Edytuj właściwości Poczty"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Edytuj właściwości Samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Edytuj właściwości Telefonu"
@@ -3589,7 +3597,7 @@ msgid "Edit start menu properties"
 msgstr "Edytuj właściwości Samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Edytuj właściwości Środowiska"
@@ -3623,15 +3631,15 @@ msgstr ""
 "Zmiana hasła jest powiązana z autentykacją do usług poczty, proxy, samba, "
 "oraz unix."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Powtórz nowe hasło"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr "Siła"
 
@@ -3647,28 +3655,28 @@ msgstr "Minimalna długość hasła"
 msgid "Use proposal"
 msgstr "grupy"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "Proszę podać prawidłowe hasło!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Ustaw hasło"
 
@@ -3687,18 +3695,18 @@ msgstr ""
 "użycie szablonów."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Szablon"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Nazwisko"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Imię"
@@ -3707,35 +3715,35 @@ msgstr "Imię"
 msgid "Manage users"
 msgstr "Zarządzaj użytkownikami"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Brak uprawnień do zmiany własnego hasła"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Account locking"
 msgstr "Blokowanie konta"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 msgid "Unlock account"
 msgstr "Odblokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 msgid "Lock account"
 msgstr "Zablokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Edytuj ogólne właściwości"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3743,20 +3751,20 @@ msgstr "Edytuj ogólne właściwości"
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Edytuj właściwości UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Edytuj właściwości Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Edytuj właściwości UNIX"
@@ -3894,8 +3902,8 @@ msgstr "Lokalizacja"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Organizacja"
 
@@ -3929,11 +3937,11 @@ msgstr "Tekst opisujący departament"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Zarządzaj użytkownikami"
@@ -3948,7 +3956,7 @@ msgstr "Zarządzaj użytkownikami"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Ustawienia administracyjne"
@@ -3977,7 +3985,7 @@ msgstr "Tekst opisujący departament"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Kategoria"
@@ -3991,20 +3999,20 @@ msgstr "Kategoria dla tego poddrzewa"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Lokalizacja"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Stan"
 
@@ -4019,10 +4027,10 @@ msgid "Location of this subtree"
 msgstr "Lokalizacja tego poddrzewa"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Adres"
 
@@ -4039,12 +4047,12 @@ msgstr "Bazowy numer telefonu tego poddrzewa"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Fax"
 
@@ -4063,8 +4071,8 @@ msgid "Domain Component"
 msgstr "Administratorzy domeny"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Departamenty"
 
@@ -4084,7 +4092,7 @@ msgid "Organization name"
 msgstr "Nazwa organizacji"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
@@ -4119,40 +4127,40 @@ msgstr ""
 "Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
 "administracyjnej!"
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Zaznaczanie '%s'."
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Przenoszenie '%s' do '%s'"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "BŁĄD kopiowania %s, anulowanie operacji"
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Nazwa departamentu"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Telefon"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Obiekt '%s' jest już zaznaczony"
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Usuwanie znacznika z obiektu '%s'"
@@ -4266,8 +4274,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Pełniona funkcja"
 
@@ -4352,206 +4360,212 @@ msgstr "Brak zainstalowanych certyfikatów"
 msgid "The selected password method is no longer available."
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr "Nie można otworzyć certyfikatu!"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Jednostka"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Identyfikator budynku"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Wywołanie"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Lokalizacja osoby"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Opis jednostki"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Sektor"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Tytuł funkcjonalny"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Nmer seryjny certyfikatu"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Publicznie widoczne"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Ulica"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Kod pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Moje konto "
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Płeć"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Zdjęcie użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "Hasło wygasa"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr "Numer pagera"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr "Certyfikaty użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "Wpisów na stronie"
@@ -4569,72 +4583,71 @@ msgstr ""
 msgid "Personal information"
 msgstr "Informacje osobiste"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Osobiste zdjęcie"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Zmień zdjęcie"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Nazwa Szablonu"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Telefon prywatny"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Edytuj certyfikaty"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr "Ogranicz logowanie do"
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr "IP lub sieć"
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Proszę użyć zakładki telefony"
 
@@ -4676,8 +4689,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Zmiana hasła"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Wyczyść pola"
 
@@ -4774,7 +4787,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4808,53 +4821,53 @@ msgstr "shadowWarning"
 msgid "shadowInactive"
 msgstr "Shadow nieaktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr "Konto POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr "ID grupy"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr "Shadow ostrzeżenie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr "Shadow nieaktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr "Shadow wygasa"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr "Publiczny klucz SSH"
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr "Zaufanie do systemów"
 
@@ -4976,31 +4989,31 @@ msgstr "Twoje hasło wygasło !! Proszę wybrać inne hasło"
 msgid "Change user password"
 msgstr "Zmień hasło"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Proszę podać obecne hasło aby kontynuować."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Hasło które podano jako 'Nowe hasło' jest puste."
 
-#: plugins/personal/password/class_password.inc:144
-#, fuzzy, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
+#: plugins/personal/password/class_password.inc:140
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 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:164
+#: plugins/personal/password/class_password.inc:167
 #, fuzzy
 msgid "You have no permission to change your password."
 msgstr "Brak uprawnień do zmiany własnego hasła"
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr "Hasło użytkownika"
 
@@ -6747,6 +6760,10 @@ msgstr "Tek krok umożliwia wybranie preferowanego języka."
 msgid "Automatic"
 msgstr "Automatycznie"
 
+#, fuzzy
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "Członek grupy"
diff --git a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
index ff2b13f78..a2c1de605 100644
--- a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages-2.6.4-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2009-03-02 15:03-0300\n"
 "Last-Translator: Clever de Oliveira Jr. <clever@dri.cefetmg.br>\n"
 "Language-Team: Brazilian Portuguese <pt@li.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +21,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -257,12 +258,12 @@ msgstr ""
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Nova senha"
 
@@ -318,7 +319,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Objeto"
 
@@ -357,26 +358,27 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Continuar"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -402,12 +404,13 @@ msgstr "Continuar"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -453,15 +456,9 @@ msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr "Senha alterada"
 
@@ -486,9 +483,9 @@ msgstr "Nova senha repetida"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 msgid "Password strength"
 msgstr ""
 
@@ -610,8 +607,8 @@ msgstr "A configuração GOsa %s/%s não pôde ser lida. Abortado."
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -640,18 +637,18 @@ msgid "Error: Password method not available!"
 msgstr "Erro: Método de senha não disponível!"
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 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."
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "A senha utilizada como nova e atual são muito similares."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "A senha utilizada como nova é curta."
 
@@ -659,11 +656,11 @@ msgstr "A senha utilizada como nova é curta."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Login"
@@ -716,34 +713,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -812,8 +809,8 @@ msgstr ""
 
 #: html/main.php:168
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 
 #: html/main.php:198
@@ -834,7 +831,7 @@ msgstr ""
 
 #: html/main.php:374
 #, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 
 #: html/main.php:388
@@ -844,8 +841,8 @@ msgstr ""
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -886,29 +883,29 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr ""
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr ""
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
@@ -934,7 +931,7 @@ msgstr "A conexão com o host '%s:%s' falhou: %s"
 msgid "Socket timeout of %s seconds reached."
 msgstr "Alcançado o limite de tempo de %s segundos para a conexão."
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -997,7 +994,7 @@ msgid "Use ACL defined in role"
 msgstr "Use ACL definida na regra"
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Usuários"
@@ -1010,19 +1007,19 @@ msgstr "Grupos"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Para cima"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Para baixo"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1042,7 +1039,7 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1109,8 +1106,8 @@ msgstr "Objeto completo"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1213,26 +1210,26 @@ msgid "Actions"
 msgstr "Ações"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr ""
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr ""
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr ""
 
@@ -1245,23 +1242,27 @@ msgid "Export list"
 msgstr ""
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+msgid "Sortable list"
+msgstr ""
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Deletar esta entrada"
 
@@ -1325,7 +1326,7 @@ msgid ""
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Configurar"
 
@@ -1354,188 +1355,188 @@ msgstr ""
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "GOsa"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Alemão"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Francês"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Inglês"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Holandês"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Polonês"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -1595,7 +1596,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1711,35 +1712,35 @@ msgstr ""
 msgid "Search in subtrees"
 msgstr "Procurar em subárvores"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr ""
 
@@ -2046,8 +2047,8 @@ msgstr ""
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2366,7 +2367,12 @@ msgstr "enquanto executava em '%s' usando LDAP server '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "enquanto executava no LDAP server %s"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2375,7 +2381,7 @@ 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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2454,7 +2460,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -2506,10 +2512,10 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Geral"
@@ -2522,7 +2528,7 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Correio"
@@ -2530,14 +2536,14 @@ msgstr "Correio"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "FAX"
 
@@ -2567,8 +2573,8 @@ msgstr ""
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Departamento"
 
@@ -2576,14 +2582,14 @@ msgstr "Departamento"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Fone"
@@ -2708,8 +2714,8 @@ msgstr "Usuário"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2717,7 +2723,7 @@ msgstr "Usuário"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2749,10 +2755,10 @@ msgstr "Usuário"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2782,13 +2788,13 @@ msgstr "Nome"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -2886,9 +2892,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "nenhum"
 
@@ -3037,7 +3043,7 @@ msgstr "Sumário FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3209,25 +3215,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Nome fornecido"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "Sobrenome"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3442,19 +3448,19 @@ msgid "Edit posix properties"
 msgstr "Editar propriedades de telefone"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Editar propriedades de correio"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Editar propriedades do samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Editar propriedades de telefone"
@@ -3471,7 +3477,7 @@ msgid "Edit start menu properties"
 msgstr "Editar propriedades do samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Editar propriedades de ambiente"
@@ -3505,15 +3511,15 @@ msgstr ""
 "Alteração de senha afeta a autenticação dos serviços de correio, proxy, "
 "samba e unix."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Repita nova senha"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr ""
 
@@ -3528,28 +3534,28 @@ msgstr "Armazenamento da senha"
 msgid "Use proposal"
 msgstr ""
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 msgid "Refresh"
 msgstr "Recarregar"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "Por favor, especifique sua senha!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Alteração de senha não permitida"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Definir a senha"
 
@@ -3568,18 +3574,18 @@ msgstr ""
 "modelos."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Modelo"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Último nome"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Primeiro nome"
@@ -3588,36 +3594,36 @@ msgstr "Primeiro nome"
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "Minha conta"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "Minha conta"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Editar propriedades gerais"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3625,20 +3631,20 @@ msgstr "Editar propriedades gerais"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Editar propriedades UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Editar propriedades do netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Editar propriedades UNIX"
@@ -3772,8 +3778,8 @@ msgstr ""
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Organização"
 
@@ -3805,11 +3811,11 @@ msgstr ""
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Pager"
@@ -3824,7 +3830,7 @@ msgstr "Pager"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr ""
@@ -3853,7 +3859,7 @@ msgstr "Exibir sistemas do departamento"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr ""
@@ -3867,20 +3873,20 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Localização"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Estado"
 
@@ -3895,10 +3901,10 @@ msgid "Location of this subtree"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Endereço"
 
@@ -3915,12 +3921,12 @@ msgstr ""
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Fax"
 
@@ -3938,8 +3944,8 @@ msgid "Domain Component"
 msgstr ""
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Departamentos"
 
@@ -3959,7 +3965,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Caixa postal"
 
@@ -3989,40 +3995,40 @@ msgstr ""
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Nome do departamento"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4124,8 +4130,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Papel"
 
@@ -4210,204 +4216,210 @@ msgstr "Nenhum certificado instalado"
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Página pessoal"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Data de nascimento"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Unidade"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Identificação da residência"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Vocação"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Última entrega"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Localização da pessoa"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Descrição da unidade"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Área de assunto"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Título funcional"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número serial do certificado"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Visível publicamente"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Rua"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "CEP"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Minha conta"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Título pessoal"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Título acadêmico"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto do usuário"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "Estações de Trabalho"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "Grupo do usuário"
@@ -4425,72 +4437,71 @@ msgstr ""
 msgid "Personal information"
 msgstr "Informação pessoal"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Foto pessoal"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Alterar foto"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Nome modelo"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Linguagem preferida"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Telefone privativo"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Armazenamento da senha"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Informação organizacional"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Nº do departamento"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Nº do empregado"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Nº da sala"
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Por favor, utilize a orelha telefone"
 
@@ -4532,8 +4543,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Senha alterada"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Limpar campos"
 
@@ -4628,7 +4639,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4661,53 +4672,53 @@ msgstr ""
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr ""
 
@@ -4827,30 +4838,30 @@ msgstr ""
 msgid "Change user password"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Você precisa especificar sua senha atual para continuar."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "O campo 'Nova senha' esta vazio."
 
-#: plugins/personal/password/class_password.inc:144
+#: plugins/personal/password/class_password.inc:140
 #, php-format
-msgid "External password changer reported a problem: %s."
+msgid "Check-hook reported a problem: %s. Password change canceled!"
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 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:164
+#: plugins/personal/password/class_password.inc:167
 msgid "You have no permission to change your password."
 msgstr ""
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr ""
 
diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
index 1c210333c..aa3270503 100644
--- a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,8 +19,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -284,12 +285,12 @@ msgstr "Пароль"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Новый пароль"
 
@@ -348,7 +349,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "Объект"
 
@@ -389,26 +390,27 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Продолжить"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -434,12 +436,13 @@ msgstr "Продолжить"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -487,15 +490,9 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 #, fuzzy
 msgid "Password change"
 msgstr "Сменить пароль"
@@ -522,9 +519,9 @@ msgstr "Новый пароль"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 #, fuzzy
 msgid "Password strength"
 msgstr "Хэширование паролей"
@@ -659,8 +656,8 @@ msgstr ""
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -691,17 +688,17 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "Новый и текущий пароли слишком похожи."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "Новый пароль слишком короткий."
 
@@ -709,11 +706,11 @@ msgstr "Новый пароль слишком короткий."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Имя пользователя"
@@ -768,34 +765,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -870,8 +867,8 @@ msgstr "Базы данных"
 #: html/main.php:168
 #, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "Используется механизм register_globals. GOsa не допустит пользователей в "
 "систему, пока он не будет отключен администратором."
@@ -896,7 +893,7 @@ msgstr "в"
 
 #: html/main.php:374
 #, fuzzy, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "Не удается найти определение для модуля \"%s\"!"
 
 #: html/main.php:388
@@ -907,8 +904,8 @@ msgstr "Настроить"
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -950,31 +947,31 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено менять пароль."
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено менять пароль."
@@ -1000,7 +997,7 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -1069,7 +1066,7 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Пользователи"
@@ -1082,20 +1079,20 @@ msgstr "Группы"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr ""
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1115,7 +1112,7 @@ msgid "ACL"
 msgstr "Доступ"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1190,8 +1187,8 @@ msgstr "Включаемые объекты"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1307,30 +1304,30 @@ msgid "Actions"
 msgstr "Действия"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 #, fuzzy
 msgid "Copy"
 msgstr "Компания"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 #, fuzzy
 msgid "Cut"
 msgstr "Выполнить"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
@@ -1346,26 +1343,31 @@ msgid "Export list"
 msgstr "Экспорт"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Объект группы"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "Экспорт"
+
+#: include/class_sortableListing.inc:226
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Удалить"
@@ -1441,7 +1443,7 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Настроить"
 
@@ -1472,197 +1474,197 @@ msgstr ""
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "Служба печати"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Удалить"
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Экспорт в LDIF"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Немецкий"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Французский"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Испанский"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Английский"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Датский"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 #, fuzzy
 msgid "Polish"
 msgstr "Английский"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 #, fuzzy
 msgid "Chinese"
 msgstr "сброс"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Имя"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Русский"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
@@ -1724,7 +1726,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1856,39 +1858,39 @@ msgstr "подразделения"
 msgid "Search in subtrees"
 msgstr "Искать в поддеревьях"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 #, fuzzy
 msgid "from"
 msgstr "и"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 #, fuzzy
 msgid "to"
 msgstr "Отношение"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 #, fuzzy
 msgid "Restore"
 msgstr "Повторить"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 #, fuzzy
 msgid "cut"
 msgstr "Выполнить"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr ""
 
@@ -2215,8 +2217,8 @@ msgstr "Удалить параметры"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2549,14 +2551,19 @@ msgstr "Ошибка при подключении к LDAP-серверу. От
 msgid "while operating on LDAP server %s"
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, 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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2636,7 +2643,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 #, fuzzy
 msgid "Unknown"
 msgstr "состояние неизвестно"
@@ -2690,10 +2697,10 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Общее"
@@ -2706,7 +2713,7 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Почта"
@@ -2714,14 +2721,14 @@ msgstr "Почта"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "Факс"
 
@@ -2751,8 +2758,8 @@ msgstr "Группа"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Подразделение"
 
@@ -2760,14 +2767,14 @@ msgstr "Подразделение"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Телефон"
@@ -2897,8 +2904,8 @@ msgstr "Пользователь"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2906,7 +2913,7 @@ msgstr "Пользователь"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2938,10 +2945,10 @@ msgstr "Пользователь"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2971,13 +2978,13 @@ msgstr "Фамилия"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3081,9 +3088,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "нет"
 
@@ -3242,7 +3249,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3426,26 +3433,26 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Имя"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 #, fuzzy
 msgid "Surname"
 msgstr "Имя сервера"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3673,21 +3680,21 @@ msgid "Edit posix properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 #, fuzzy
 msgid "Edit phone properties"
@@ -3706,7 +3713,7 @@ msgid "Edit start menu properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 #, fuzzy
 msgid "Edit environment properties"
@@ -3744,15 +3751,15 @@ msgstr ""
 "Изменение пароля влияет на аутентификацию при использовании почты, прокси-"
 "сервера, Samba и служб UNIX."
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Подтверждение"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 #, fuzzy
 msgid "Strength"
 msgstr "Улица"
@@ -3769,29 +3776,29 @@ msgstr "Пароль"
 msgid "Use proposal"
 msgstr "группы"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 #, fuzzy
 msgid "Refresh"
 msgstr "Ссылки"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "Введите свой пароль!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Сменить пароль"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Изменить пароль"
 
@@ -3811,19 +3818,19 @@ msgstr ""
 "использовать шаблоны."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Шаблон"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 #, fuzzy
 msgid "Last name"
 msgstr "Список"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 #, fuzzy
 msgid "First name"
@@ -3834,39 +3841,39 @@ msgstr "Список"
 msgid "Manage users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Account locking"
 msgstr "Учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "Моя учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "Моя учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3874,21 +3881,21 @@ msgstr "Изменить свойства"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 #, fuzzy
 msgid "Edit netatalk properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Изменить свойства"
@@ -4031,8 +4038,8 @@ msgstr "Местоположение"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Организация"
 
@@ -4066,11 +4073,11 @@ msgstr "Описание подразделения"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Пользователи домена"
@@ -4085,7 +4092,7 @@ msgstr "Пользователи домена"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 #, fuzzy
 msgid "Administrative settings"
@@ -4115,7 +4122,7 @@ msgstr "Описание подразделения"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Категория"
@@ -4129,20 +4136,20 @@ msgstr "Категория этой ветки"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Местоположение"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Адм. единица"
 
@@ -4157,10 +4164,10 @@ msgid "Location of this subtree"
 msgstr "Местоположение ветки"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Адрес"
 
@@ -4177,12 +4184,12 @@ msgstr "Основный телефонный номер для ветки"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Факс"
 
@@ -4201,8 +4208,8 @@ msgid "Domain Component"
 msgstr "Администраторы домена"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Подразделения"
 
@@ -4224,7 +4231,7 @@ msgid "Organization name"
 msgstr "Организация"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
@@ -4259,41 +4266,41 @@ msgstr "Имя создаваемой ветки"
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 #, fuzzy
 msgid "Department name"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Телефон"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
@@ -4408,8 +4415,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Роль"
 
@@ -4498,220 +4505,226 @@ msgstr "Изменить сертификаты"
 msgid "The selected password method is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Дата рождения"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Номер дома"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Специальность"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Местоположение сотрудника"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Описание подразделения"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Область деятельности"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Должность"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Улица"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Пол"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 #, fuzzy
 msgid "Room number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 #, fuzzy
 msgid "User certificates"
 msgstr "Стандартный сертификат"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "Группа пользователя"
@@ -4729,74 +4742,73 @@ msgstr ""
 msgid "Personal information"
 msgstr "Личная информация"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Сменить изображение"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 #, fuzzy
 msgid "Template name"
 msgstr "Шаблон"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 #, fuzzy
 msgid "Preferred langage"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Личный телефон"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Сертификаты"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Воспользуйтесь закладкой \"Телефон\""
 
@@ -4842,8 +4854,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Сменить пароль"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Очистить поля"
 
@@ -4948,7 +4960,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4985,61 +4997,61 @@ msgstr "Затенение"
 msgid "shadowInactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 #, fuzzy
 msgid "POSIX account"
 msgstr "Аккаунт FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Оболочка"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 #, fuzzy
 msgid "Group ID"
 msgstr "Группа"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Сменить пароль"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 #, fuzzy
 msgid "Shadow min"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 #, fuzzy
 msgid "Shadow max"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Показать людей"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 #, fuzzy
 msgid "System trust model"
 msgstr "Системные доверия"
@@ -5165,31 +5177,31 @@ msgstr "У вас недостаточно прав для смены своег
 msgid "Change user password"
 msgstr "Сменить пароль"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
-#: plugins/personal/password/class_password.inc:144
-#, fuzzy, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "При попытке сменить пароль извне возникла проблема: "
+#: plugins/personal/password/class_password.inc:140
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "Введенный вами текущий пароль не совпадает с реальным."
 
-#: plugins/personal/password/class_password.inc:164
+#: plugins/personal/password/class_password.inc:167
 #, fuzzy
 msgid "You have no permission to change your password."
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 #, fuzzy
 msgid "User password"
 msgstr "Новый пароль"
@@ -6939,6 +6951,10 @@ msgstr "Язык по умолчанию"
 msgid "Automatic"
 msgstr "автоматически"
 
+#, fuzzy
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "При попытке сменить пароль извне возникла проблема: "
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "Члены группы"
diff --git a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
index 3d499f670..35f4ce6a9 100644
--- a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VIcore2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2008-07-04 09:59+0200\n"
 "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
 "Language-Team: Vietnamese\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,8 +23,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -277,12 +278,12 @@ msgstr "Mật khẩu cũ"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "Mật khẩu mới"
 
@@ -347,7 +348,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "đối tượng"
 
@@ -392,26 +393,27 @@ msgstr "Lý do để tạo ra snapshot này"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "Tiếp tục"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -437,12 +439,13 @@ msgstr "Tiếp tục"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -488,15 +491,9 @@ msgid "Your password has been changed successfully."
 msgstr "Mật khẩu của bạn đã được thay đổi thành công."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 msgid "Password change"
 msgstr "Thay đổi mật khẩu"
 
@@ -524,9 +521,9 @@ msgstr "Mật khẩu mới được lặp lại"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 msgid "Password strength"
 msgstr "Ưu điểm của mật khẩu"
 
@@ -659,8 +656,8 @@ msgstr "Cấu hình GOsa %s/%s không đọc được. Bãi bỏ."
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -690,7 +687,7 @@ msgid "Error: Password method not available!"
 msgstr "Lỗi: Phương pháp mật khẩu không có!"
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -698,11 +695,11 @@ 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/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "Mật khẩu mới và mật khẩu cũ quá giống nhau."
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 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."
 
@@ -710,11 +707,11 @@ msgstr "Mật khẩu mới cần được cắt ngắn lại."
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "Đăng nhập"
@@ -773,34 +770,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -871,9 +868,10 @@ msgid "PHP configuration"
 msgstr "Cấu hình PHP"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr ""
 "LỖI NGHIÊM TRỌNG: Đăng ký toàn cầu đang bật. GOsa sẽ từ chối đăng nhập vào "
 "trừ khi lỗi này được một admin sửa."
@@ -895,8 +893,8 @@ msgid "Plugin"
 msgstr "Plugin"
 
 #: html/main.php:374
-#, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+#, fuzzy, php-format
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr ""
 "LỖI NGHIÊM TRỌNG: không thể tìm thấy bất cứ  plugin definition nào cho "
 "plugin '%s'!"
@@ -909,8 +907,8 @@ msgstr "Lỗi cấu hình"
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -951,29 +949,29 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 msgid "Permission"
 msgstr "Cho phép"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr "Lỗi về cấp phép"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, 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."
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, 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."
@@ -999,7 +997,7 @@ msgstr "Kết nối socket đến  '%s:%s' thất bại:  '%s'"
 msgid "Socket timeout of %s seconds reached."
 msgstr "Thời hạn cho socket là  %s giây đã đến."
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 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!"
@@ -1067,7 +1065,7 @@ msgid "Use ACL defined in role"
 msgstr "Sử dụng ACL được xác định trong vai trò"
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "Người dùng"
@@ -1080,19 +1078,19 @@ msgstr "Các nhóm"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "Lên"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "Xuống"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1112,7 +1110,7 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1180,8 +1178,8 @@ msgstr "Hoàn thành đối tượng"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1287,26 +1285,26 @@ msgid "Actions"
 msgstr "Các thao tác"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 msgid "Copy"
 msgstr "Copy"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 msgid "Cut"
 msgstr "Cut"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
@@ -1320,23 +1318,27 @@ msgid "Export list"
 msgstr ""
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+msgid "Sortable list"
+msgstr ""
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "Hiệu chỉnh entry này"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "Xóa bỏ entry"
 
@@ -1413,7 +1415,7 @@ 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:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "Cấu hình"
 
@@ -1442,54 +1444,54 @@ msgstr "các entry cho mỗi trang"
 msgid "Apply filter"
 msgstr "Áp dụng bộ lọc"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "GOsa"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, fuzzy, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "snapshot phát triển GOsa (Rev %s)"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "snapshot phát triển GOsa (Rev %s)"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "File '%s' không thể bị xóa."
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 #, fuzzy
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'base_hook' không có. Hãy sử dụng cơ sở mặc định!"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 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 đồ!"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 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:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1497,27 +1499,27 @@ 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:2798
+#: include/functions.inc:2801
 #, 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:2801
+#: include/functions.inc:2804
 #, 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:2806
+#: include/functions.inc:2809
 #, 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:2809
+#: include/functions.inc:2812
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1525,7 +1527,7 @@ 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1533,7 +1535,7 @@ msgstr ""
 "Để có thể sử dụng được nhóm conform rfc2307bis, objectClass "
 "'posixGroup' (nhóm posix) phải được hỗ trợ     "
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1541,51 +1543,51 @@ 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:2837
+#: include/functions.inc:2840
 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:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "Tiếng Đức"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "Tiếng Pháp"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "Tiếng Ý"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "Tiếng Tây Ban Nha"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "Tiếng Anh"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "Tiếng Hà Lan"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "Tiếng Phần Lan"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr "Tiếng Trung Quốc"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 msgid "Vietnamese"
 msgstr "Tiếng Việt"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "Tiếng Nga"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1593,52 +1595,52 @@ 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:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr "Không thể sinh ra hàm băm samba!"
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Không thể phân phối một ID miễn phí!"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 #, fuzzy
 msgid "no ID available!"
 msgstr "Không có mẫu nào!"
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 msgid "Cannot allocate a free ID!"
 msgstr "Không thể phân phối một ID miễn phí!"
 
@@ -1698,7 +1700,7 @@ msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1817,7 +1819,7 @@ msgstr "Tranh luận"
 msgid "Search in subtrees"
 msgstr "Tìm kiếm tại các cây con"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
@@ -1825,29 +1827,29 @@ msgstr ""
 "Đối tượng đã bị thay đổi từ khi được mở trong GOsa. Nếu bạn lưu entry này "
 "lại, khi các đối tượng khác lạc hướng có thể gây ra thêm tất cả các thay đổi!"
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr "Thay đổi ACL dn"
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "Từ"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 msgid "to"
 msgstr "đến"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 msgid "Restore"
 msgstr "Phục hồi"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "cắt"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "Copy"
 
@@ -2154,8 +2156,8 @@ msgstr "PHP mở rộng %s mất tích!"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2483,7 +2485,12 @@ msgstr "Trong khi chạy trên '%s' sử dụng LDAP server '%s'"
 msgid "while operating on LDAP server %s"
 msgstr "Trong khi chạy trên LDAP server %s"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2492,7 +2499,7 @@ 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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -2569,7 +2576,7 @@ msgstr "Định dạng cấu hình đã thay đổi. Xin hãy chạy lại cài
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "Không rõ"
 
@@ -2621,10 +2628,10 @@ msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Thông tin chung"
@@ -2637,7 +2644,7 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "ThÆ°"
@@ -2645,14 +2652,14 @@ msgstr "ThÆ°"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "Fax"
 
@@ -2682,8 +2689,8 @@ msgstr "Nhóm "
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "Bộ phận"
 
@@ -2691,14 +2698,14 @@ msgstr "Bộ phận"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Số điện thoại"
@@ -2825,8 +2832,8 @@ msgstr "Người dùng"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2834,7 +2841,7 @@ msgstr "Người dùng"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2866,10 +2873,10 @@ msgstr "Người dùng"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2899,13 +2906,13 @@ msgstr "Tên"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3008,9 +3015,9 @@ msgstr ""
 "tượng!"
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "không có"
 
@@ -3160,7 +3167,7 @@ msgstr "Tóm tắt FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3331,26 +3338,26 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "Tên thật"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 #, fuzzy
 msgid "Surname"
 msgstr "Họ "
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr "Hiệu chỉnh đa dạng"
 
@@ -3568,19 +3575,19 @@ msgid "Edit posix properties"
 msgstr "Hiệu chỉnh các tính năng điện thoại"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Hiệu chỉnh các tính năng mail"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Hiệu chỉnh các tính năng samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Hiệu chỉnh các tính năng điện thoại"
@@ -3597,7 +3604,7 @@ msgid "Edit start menu properties"
 msgstr "Hiệu chỉnh các tính năng samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Hiệu chỉnh các tính năng môi trường"
@@ -3632,15 +3639,15 @@ 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/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "Lặp lại mật khẩu mới"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 msgid "Strength"
 msgstr "Cường độ"
 
@@ -3656,29 +3663,29 @@ msgstr "Độ dài tối thiểu của mật khẩu"
 msgid "Use proposal"
 msgstr "các nhóm người dùng"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 #, fuzzy
 msgid "Refresh"
 msgstr "Các tham chiếu"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "Xin hãy xác định mật mã của bạn!"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "Ép buộc thay đổi mật khẩu trong khi đăng nhập"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "Đặt mật khẩu"
 
@@ -3697,18 +3704,18 @@ msgstr ""
 "các mẫu."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "Mẫu"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "Họ"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "Tên"
@@ -3717,37 +3724,37 @@ msgstr "Tên"
 msgid "Manage users"
 msgstr "Quản lý người dùng"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 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:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Account locking"
 msgstr "Tài khoản"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "Hiệu chỉnh các tính năng chung"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3755,20 +3762,20 @@ msgstr "Hiệu chỉnh các tính năng chung"
 msgid "POSIX"
 msgstr "POSIX (giao diện hệ điều hành lưu động)"
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Hiệu chỉnh các tính năng UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "Hiệu chỉnh các đặc tính của netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Hiệu chỉnh các tính năng UNIX"
@@ -3910,8 +3917,8 @@ msgstr "Vị trí"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "Tổ chức"
 
@@ -3945,11 +3952,11 @@ msgstr "Văn bản mô tả cho bộ phận"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "Quản lý người dùng"
@@ -3964,7 +3971,7 @@ msgstr "Quản lý người dùng"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "Thiết lập quản trị"
@@ -3993,7 +4000,7 @@ msgstr "Văn bản mô tả cho bộ phận"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "Các danh mục"
@@ -4007,20 +4014,20 @@ msgstr "Các danh mục cho cây con"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "Vị trí"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "Bang"
 
@@ -4035,10 +4042,10 @@ msgid "Location of this subtree"
 msgstr "Vị trí của cây con"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "Địa chỉ"
 
@@ -4055,12 +4062,12 @@ msgstr "Đặt số điện thoại của cây con này"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "Số fax"
 
@@ -4079,8 +4086,8 @@ msgid "Domain Component"
 msgstr "Admin miền"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "Các bộ phận"
 
@@ -4104,7 +4111,7 @@ msgid "Organization name"
 msgstr "Tổ chức"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "Địa chỉ theo bưu điện"
 
@@ -4138,40 +4145,40 @@ msgstr "Tên của cây con được tạo"
 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:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "Tagging '%s'."
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "Chuyển từ '%s' đến '%s'"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, 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:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "Tên bộ phận"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "Số điện thoại"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "Đối tượng '%s' đã bị tag"
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, 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:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "Bỏ tag từ đối tượng '%s'"
@@ -4284,8 +4291,8 @@ msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "Vai trò"
 
@@ -4373,205 +4380,211 @@ msgstr "Không có giấy chứng nhận nào được cài đặt"
 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:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 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:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "Ngày sinh"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 msgid "Cannot open certificate!"
 msgstr "Không mở được giấy chứng nhận!"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "Đơn vị"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "Mô tả căn nhà"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "Nghề nghiệp"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "Lần cung cấp cuối"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr "Địa phương của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "Mô tả đơn vị "
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr "Lĩnh vực chuyên môn"
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "Danh xưng chức năng"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Số seri chứng nhận"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "Hiển thị với tất cả mọi người"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "Phố"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "Mã bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 msgid "Generic user settings"
 msgstr "Thiết lập chung của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 msgid "User identification"
 msgstr "Chứng nhận người dùng"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "Chức danh cá nhân"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "Chức danh học thuật"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "Giới tính"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Ảnh của người sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "Các hạn chế mật khẩu"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 msgid "Telefon number"
 msgstr "Số điện thoại"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 msgid "Pager number"
 msgstr "Số máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 msgid "Mobile number"
 msgstr "Số di động"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 msgid "Fax number"
 msgstr "Số fax"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "Phương pháp lập mật khẩu"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 msgid "User certificates"
 msgstr "Giấy phép của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "các entry cho mỗi trang"
@@ -4589,72 +4602,71 @@ msgstr ""
 msgid "Personal information"
 msgstr "Thông tin cá nhân"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "Ảnh cá nhân"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "Thay đổi hình ảnh"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "Tên Mẫu"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "Ngôn ngữ muốn dùng"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "Số điện thoại riêng"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "Kho lưu mật khẩu"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Các giấy phép"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "Hiệu chỉnh các giấy phép"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "Số phòng ban"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "Số phòng"
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "Xin hãy sử dụng Phone Tab"
 
@@ -4696,8 +4708,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "Thay đổi mật khẩu"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "Dọn sạch các trường "
 
@@ -4797,7 +4809,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4830,53 +4842,53 @@ msgstr "Cảnh báo về Shadow"
 msgid "shadowInactive"
 msgstr "Shadow  không hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 msgid "POSIX account"
 msgstr "tài khoản POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Group ID"
 msgstr "ID nhóm"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 msgid "Force password change on login"
 msgstr "Ép buộc thay đổi mật khẩu trong khi đăng nhập"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 msgid "Shadow warning"
 msgstr "Cảnh báo Shadow"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 msgid "Shadow inactive"
 msgstr "Shadow không hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 msgid "Shadow expire"
 msgstr "Shadow hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 msgid "System trust model"
 msgstr "Mô hình ủy thác hệ thống"
 
@@ -4999,31 +5011,31 @@ msgstr "Mật khẩu của bạn đã hết hạn. Xin hãy chọn một mật k
 msgid "Change user password"
 msgstr "Thay đổi mật khẩu người dùng"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "Bạn cần xác định mật khẩu hiện tại để có thể tiếp tục."
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Mật khẩu bạn vừa nhập vào làm \"Mật khẩu mới\" bị rỗng."
 
-#: plugins/personal/password/class_password.inc:144
+#: plugins/personal/password/class_password.inc:140
 #, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "Bộ thay đổi mật khẩu bên ngoài báo cáo có vấn đề:%s."
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 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."
 
-#: plugins/personal/password/class_password.inc:164
+#: plugins/personal/password/class_password.inc:167
 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:201
+#: plugins/personal/password/class_password.inc:204
 msgid "User password"
 msgstr "Mật khẩu người dùng"
 
@@ -6740,6 +6752,9 @@ msgstr "Bước này cho phép bạn lựa chọn ngôn ngữ bạn muốn dùng
 msgid "Automatic"
 msgstr "Tự động"
 
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "Bộ thay đổi mật khẩu bên ngoài báo cáo có vấn đề:%s."
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "Thành viên nhóm"
diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
index 41b0a7269..e17df63d5 100644
--- a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:24+0200\n"
+"POT-Creation-Date: 2010-10-29 19:13+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,8 +21,8 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:406 html/index.php:412
-#: include/functions.inc:954 include/functions.inc:2686
-#: include/functions.inc:2690 include/functions.inc:2696
+#: include/functions.inc:954 include/functions.inc:2689
+#: include/functions.inc:2693 include/functions.inc:2699
 #: include/class_tabs.inc:268 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/groups/class_group.inc:994 plugins/admin/users/remove.tpl:2
@@ -274,12 +275,12 @@ msgstr "旧口令"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:17
-#: plugins/admin/users/password.tpl:53
+#: plugins/admin/users/password.tpl:60
 #: plugins/admin/users/class_userManagement.inc:319
 #: plugins/personal/generic/password.tpl:22
-#: plugins/personal/generic/password.tpl:65
+#: plugins/personal/generic/password.tpl:72
 #: plugins/personal/password/password.tpl:27
-#: plugins/personal/password/password.tpl:70
+#: plugins/personal/password/password.tpl:78
 msgid "New password"
 msgstr "新口令"
 
@@ -338,7 +339,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:777
 #: include/class_acl.inc:784 include/class_acl.inc:791
 #: include/class_acl.inc:797 include/utils/class_msgPool.inc:475
-#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/class_department.inc:619
 msgid "Object"
 msgstr "对象"
 
@@ -380,26 +381,27 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:561
-#: plugins/admin/departments/class_department.inc:643
+#: plugins/admin/departments/class_department.inc:559
+#: plugins/admin/departments/class_department.inc:641
 msgid "Continue"
 msgstr "继续"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
 #: html/index.php:228 include/class_management.inc:448
-#: include/class_management.inc:584 include/class_management.inc:916
-#: include/password-methods/class_password-methods.inc:250
-#: include/password-methods/class_password-methods.inc:309
-#: include/password-methods/class_password-methods.inc:320
-#: include/class_listing.inc:480 include/functions.inc:3393
-#: include/functions.inc:3407 include/functions.inc:3437
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485 include/functions.inc:3545
-#: include/class_tabs.inc:56 include/class_plugin.inc:670
-#: include/class_plugin.inc:712 include/class_plugin.inc:755
-#: include/class_plugin.inc:1642 include/utils/class_xml.inc:40
+#: include/class_management.inc:584
+#: include/password-methods/class_password-methods.inc:269
+#: include/password-methods/class_password-methods.inc:328
+#: include/password-methods/class_password-methods.inc:339
+#: include/class_listing.inc:480 include/functions.inc:3399
+#: include/functions.inc:3413 include/functions.inc:3443
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491 include/functions.inc:3551
+#: include/class_tabs.inc:56 include/class_plugin.inc:679
+#: include/class_plugin.inc:724 include/class_plugin.inc:770
+#: include/class_plugin.inc:1269 include/class_plugin.inc:1276
+#: include/class_plugin.inc:1766 include/utils/class_xml.inc:40
 #: include/utils/class_msgPool.inc:154 include/utils/class_msgPool.inc:166
 #: include/utils/class_msgPool.inc:184 include/utils/class_msgPool.inc:457
 #: include/utils/class_msgPool.inc:478 include/utils/class_msgPool.inc:497
@@ -425,12 +427,13 @@ msgstr "继续"
 #: plugins/personal/generic/class_user.inc:297
 #: plugins/personal/generic/class_user.inc:408
 #: plugins/personal/generic/class_user.inc:503
-#: plugins/personal/generic/class_user.inc:801
-#: plugins/personal/generic/class_user.inc:1190
-#: plugins/personal/generic/class_user.inc:1197
-#: plugins/personal/generic/class_user.inc:1215
-#: plugins/personal/generic/class_user.inc:1485
-#: plugins/personal/generic/class_user.inc:1783
+#: plugins/personal/generic/class_user.inc:802
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1183
+#: plugins/personal/generic/class_user.inc:1201
+#: plugins/personal/generic/class_user.inc:1471
+#: plugins/personal/generic/class_user.inc:1775
 #: setup/class_setupStep_Migrate.inc:1201 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
 #, php-format
@@ -478,15 +481,9 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:198
-#: plugins/admin/users/class_userManagement.inc:390
-#: plugins/personal/password/class_password.inc:128
-#: plugins/personal/password/class_password.inc:131
-#: plugins/personal/password/class_password.inc:134
-#: plugins/personal/password/class_password.inc:137
-#: plugins/personal/password/class_password.inc:140
-#: plugins/personal/password/class_password.inc:143
-#: plugins/personal/password/class_password.inc:157
-#: plugins/personal/password/class_password.inc:163
+#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/personal/password/class_password.inc:160
+#: plugins/personal/password/class_password.inc:166
 #, fuzzy
 msgid "Password change"
 msgstr "不允许修改口令"
@@ -513,9 +510,9 @@ msgstr "新口令"
 
 #: ihtml/themes/default/password.tpl:90
 #: plugins/personal/generic/password.tpl:32
-#: plugins/personal/generic/password.tpl:75
+#: plugins/personal/generic/password.tpl:82
 #: plugins/personal/password/password.tpl:37
-#: plugins/personal/password/password.tpl:80
+#: plugins/personal/password/password.tpl:88
 #, fuzzy
 msgid "Password strength"
 msgstr "口令存储"
@@ -645,8 +642,8 @@ msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
 #: include/class_SnapshotHandler.inc:76 include/functions.inc:825
-#: include/functions.inc:3067 include/functions.inc:3099
-#: include/functions.inc:3112 include/utils/class_timezone.inc:47
+#: include/functions.inc:3073 include/functions.inc:3105
+#: include/functions.inc:3118 include/utils/class_timezone.inc:47
 #: include/class_config.inc:155 include/class_config.inc:695
 #: include/class_config.inc:1146 include/class_config.inc:1159
 #: include/class_config.inc:1177 include/class_pluglist.inc:182
@@ -677,17 +674,17 @@ msgid "Error: Password method not available!"
 msgstr ""
 
 #: html/password.php:193 plugins/admin/users/class_userManagement.inc:316
-#: plugins/personal/password/class_password.inc:132
+#: plugins/personal/password/class_password.inc:117
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "您输入的“新口令”和“重复新口令”不匹配。"
 
-#: html/password.php:204 plugins/personal/password/class_password.inc:138
+#: html/password.php:204 plugins/personal/password/class_password.inc:121
 msgid "The password used as new and current are too similar."
 msgstr "输入的新口令和当前口令非常相似。"
 
-#: html/password.php:209 plugins/personal/password/class_password.inc:141
+#: html/password.php:209 plugins/personal/password/class_password.inc:123
 msgid "The password used as new is to short."
 msgstr "输入的新口令太短了。"
 
@@ -695,11 +692,11 @@ msgstr "输入的新口令太短了。"
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:56
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:65
 #: plugins/admin/users/template.tpl:32 plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1317
 #: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1345
-#: plugins/personal/generic/class_user.inc:1347
-#: plugins/personal/generic/generic.tpl:82
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:84
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
 msgstr "登录名"
@@ -754,34 +751,34 @@ msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
 #: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1233
+#: include/class_SnapshotHandler.inc:330 include/class_SnapshotHandler.inc:334
+#: include/class_SnapshotHandler.inc:349 include/class_SnapshotHandler.inc:384
+#: include/class_SnapshotHandler.inc:439 include/class_SnapshotHandler.inc:504
+#: include/class_SnapshotHandler.inc:519 include/class_acl.inc:1233
 #: include/class_acl.inc:1329 include/functions.inc:483
 #: include/functions.inc:518 include/functions.inc:526
 #: include/functions.inc:571 include/functions.inc:840
 #: include/functions.inc:889 include/functions.inc:946
-#: include/functions.inc:999 include/functions.inc:3046
-#: include/functions.inc:3319 include/class_plugin.inc:1319
-#: include/class_plugin.inc:1368 include/class_plugin.inc:1372
-#: include/class_plugin.inc:1388 include/class_plugin.inc:1428
-#: include/class_plugin.inc:1486 include/class_plugin.inc:1552
-#: include/class_plugin.inc:1567 include/class_ldap.inc:756
-#: include/class_ldap.inc:1222 include/class_config.inc:318
+#: include/functions.inc:999 include/functions.inc:3052
+#: include/functions.inc:3325 include/class_plugin.inc:1442
+#: include/class_plugin.inc:1492 include/class_plugin.inc:1496
+#: include/class_plugin.inc:1512 include/class_plugin.inc:1552
+#: include/class_plugin.inc:1610 include/class_plugin.inc:1676
+#: include/class_plugin.inc:1691 include/class_ldap.inc:756
+#: include/class_ldap.inc:1219 include/class_config.inc:318
 #: plugins/admin/ogroups/class_ogroup.inc:888
 #: plugins/admin/ogroups/class_ogroup.inc:902
 #: plugins/admin/groups/class_group.inc:697
 #: plugins/admin/groups/class_group.inc:1018
 #: plugins/admin/departments/class_department.inc:279
 #: plugins/admin/departments/class_department.inc:476
-#: plugins/admin/departments/class_department.inc:750
-#: plugins/admin/departments/class_department.inc:781
+#: plugins/admin/departments/class_department.inc:748
+#: plugins/admin/departments/class_department.inc:779
 #: plugins/admin/acl/class_aclRole.inc:613
 #: plugins/admin/acl/class_aclRole.inc:653
 #: plugins/admin/acl/class_aclRole.inc:667
 #: plugins/personal/generic/class_user.inc:716
-#: plugins/personal/generic/class_user.inc:1112
+#: plugins/personal/generic/class_user.inc:1098
 #: plugins/personal/posix/class_posixAccount.inc:631
 #: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1212
@@ -853,9 +850,10 @@ msgid "PHP configuration"
 msgstr "PHP 安装检查"
 
 #: html/main.php:168
+#, fuzzy
 msgid ""
-"FATAL: Register globals is on. GOsa will refuse to login unless this is "
-"fixed by an administrator."
+"Fatal error: Register globals is on. GOsa will refuse to login unless this "
+"is fixed by an administrator."
 msgstr "致命错误：全局注册已打开。GOsa 将拒绝登录直到被管理修正。"
 
 #: html/main.php:198
@@ -878,7 +876,7 @@ msgstr "于"
 
 #: html/main.php:374
 #, fuzzy, php-format
-msgid "FATAL: Cannot find any plugin definitions for plugin '%s'!"
+msgid "Fatal error: Cannot find any plugin definitions for plugin '%s'!"
 msgstr "警告： 没有发现针对插件 '%s' 的任何插件定义！"
 
 #: html/main.php:388
@@ -889,8 +887,8 @@ msgstr "配置文件"
 #: html/main.php:389
 #, php-format
 msgid ""
-"FATAL: not all POST variables have been transfered by PHP - please inform "
-"your administrator!"
+"Fatal error: not all POST variables have been transfered by PHP - please "
+"inform your administrator!"
 msgstr ""
 
 #: html/helpviewer.php:64
@@ -930,31 +928,31 @@ msgstr ""
 
 #: include/class_management.inc:292 include/class_management.inc:427
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1590
-#: include/class_plugin.inc:1602 include/class_plugin.inc:1617
-#: include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1714
+#: include/class_plugin.inc:1726 include/class_plugin.inc:1741
+#: include/class_plugin.inc:1754
 #: plugins/admin/users/class_userManagement.inc:236
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
 #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:702
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: include/class_management.inc:427 include/class_plugin.inc:1590
+#: include/class_management.inc:427 include/class_plugin.inc:1714
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "您无权删除这个用户！"
 
 #: include/class_management.inc:474 include/class_management.inc:511
-#: include/class_management.inc:525 include/class_plugin.inc:1602
-#: include/class_plugin.inc:1617 include/class_plugin.inc:1630
+#: include/class_management.inc:525 include/class_plugin.inc:1726
+#: include/class_plugin.inc:1741 include/class_plugin.inc:1754
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "您无权删除这个用户！"
@@ -980,7 +978,7 @@ msgstr ""
 msgid "Socket timeout of %s seconds reached."
 msgstr ""
 
-#: include/password-methods/class_password-methods.inc:250
+#: include/password-methods/class_password-methods.inc:269
 msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
@@ -1049,7 +1047,7 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:233 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/class_user.inc:1666
 #: setup/class_setupStep_Migrate.inc:1040
 msgid "Users"
 msgstr "用户"
@@ -1062,19 +1060,19 @@ msgstr "用户组"
 
 #: include/class_acl.inc:496 include/class_listing.inc:242
 #: include/class_listing.inc:999 include/class_listing.inc:1001
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:372
 msgid "Up"
 msgstr "上"
 
 #: include/class_acl.inc:498 include/class_listing.inc:242
-#: include/class_sortableListing.inc:225
+#: include/class_sortableListing.inc:261
 #: plugins/admin/acl/class_aclRole.inc:374
 msgid "Down"
 msgstr "关闭"
 
 #: include/class_acl.inc:503 include/class_acl.inc:551
-#: include/class_sortableListing.inc:192 include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:224 include/class_sortableListing.inc:226
 #: plugins/admin/ogroups/ogroup-list.xml:91
 #: plugins/admin/groups/group-list.xml:108
 #: plugins/admin/users/user-list.xml:114
@@ -1094,7 +1092,7 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:507 include/class_acl.inc:555
-#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:229 include/class_sortableListing.inc:231
 #: include/utils/class_msgPool.inc:342 plugins/admin/acl/class_aclRole.inc:381
 #: plugins/admin/acl/class_aclRole.inc:430
 #, php-format
@@ -1168,8 +1166,8 @@ msgstr "成员对象"
 #: include/class_session.inc:101 include/class_session.inc:127
 #: include/functions.inc:611 include/functions.inc:815
 #: include/functions.inc:933 include/functions.inc:1331
-#: include/functions.inc:2414 include/functions.inc:2448
-#: include/functions.inc:2468 include/class_ldap.inc:693
+#: include/functions.inc:2421 include/functions.inc:2451
+#: include/functions.inc:2471 include/class_ldap.inc:693
 #: include/class_ldap.inc:744 include/class_log.inc:87
 #: include/class_CopyPasteHandler.inc:160
 #: include/class_CopyPasteHandler.inc:274
@@ -1279,28 +1277,28 @@ msgid "Actions"
 msgstr "动作"
 
 #: include/class_listing.inc:1380 include/class_listing.inc:1430
-#: include/class_plugin.inc:2114
+#: include/class_plugin.inc:2238
 #, fuzzy
 msgid "Copy"
 msgstr "复制"
 
 #: include/class_listing.inc:1386 include/class_listing.inc:1420
-#: include/class_plugin.inc:2118
+#: include/class_plugin.inc:2242
 #, fuzzy
 msgid "Cut"
 msgstr "剪切"
 
 #: include/class_listing.inc:1394 include/class_listing.inc:1396
-#: include/class_plugin.inc:2125 include/class_plugin.inc:2128
+#: include/class_plugin.inc:2249 include/class_plugin.inc:2252
 #: include/class_CopyPasteHandler.inc:570
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1420 include/class_plugin.inc:2072
+#: include/class_listing.inc:1420 include/class_plugin.inc:2196
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1430 include/class_plugin.inc:2080
+#: include/class_listing.inc:1430 include/class_plugin.inc:2204
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
@@ -1315,25 +1313,30 @@ msgid "Export list"
 msgstr "导出"
 
 #: include/class_listing.inc:1513 include/class_listing.inc:1514
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2046
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2170
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1523 include/class_plugin.inc:2053
+#: include/class_listing.inc:1523 include/class_plugin.inc:2177
 #, fuzzy
 msgid "Create snapshot"
 msgstr "创建 nagios 账户"
 
-#: include/class_listing.inc:1524 include/class_plugin.inc:2054
+#: include/class_listing.inc:1524 include/class_plugin.inc:2178
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "创建新 FAI 对象"
 
-#: include/class_sortableListing.inc:194
+#: include/class_sortableListing.inc:221
+#, fuzzy
+msgid "Sortable list"
+msgstr "导出"
+
+#: include/class_sortableListing.inc:226
 msgid "Edit this entry"
 msgstr "编辑这条记录"
 
-#: include/class_sortableListing.inc:199
+#: include/class_sortableListing.inc:231
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
@@ -1400,7 +1403,7 @@ msgid ""
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:221
+#: include/functions.inc:1272 plugins/personal/generic/generic.tpl:223
 msgid "Configure"
 msgstr "配置"
 
@@ -1429,196 +1432,196 @@ msgstr "每页条目数"
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/functions.inc:2252 include/class_filter.inc:281
+#: include/functions.inc:2259 include/class_filter.inc:281
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2313
 #, fuzzy, php-format
 msgid "GOsa %s"
 msgstr "Syslog 服务"
 
-#: include/functions.inc:2313
+#: include/functions.inc:2320
 #, fuzzy, php-format
 msgid "GOsa %s snapshot (Rev %s)"
 msgstr "GOsa 开发版（版本 %s）"
 
-#: include/functions.inc:2318
+#: include/functions.inc:2325
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa 开发版（版本 %s）"
 
-#: include/functions.inc:2414
+#: include/functions.inc:2421
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2448 include/functions.inc:2468
+#: include/functions.inc:2451 include/functions.inc:2471
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/functions.inc:2686 include/functions.inc:2690
-#: include/functions.inc:2696
+#: include/functions.inc:2689 include/functions.inc:2693
+#: include/functions.inc:2699
 #, fuzzy
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "警告： nextIdHook不可用。使用缺省 base。"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP 管理"
 
-#: include/functions.inc:2720
+#: include/functions.inc:2723
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "不能从服务器得到 schema 信息。无法对 schema 检查！"
 
-#: include/functions.inc:2746
+#: include/functions.inc:2749
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2756
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2798
+#: include/functions.inc:2801
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2801
+#: include/functions.inc:2804
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2806
+#: include/functions.inc:2809
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2809
+#: include/functions.inc:2812
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "文件可用。"
 
-#: include/functions.inc:2831
+#: include/functions.inc:2834
 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:2832
+#: include/functions.inc:2835
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2836
+#: include/functions.inc:2839
 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:2837
+#: include/functions.inc:2840
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2861
+#: include/functions.inc:2864
 msgid "German"
 msgstr "德语"
 
-#: include/functions.inc:2862
+#: include/functions.inc:2865
 msgid "French"
 msgstr "法语"
 
-#: include/functions.inc:2863
+#: include/functions.inc:2866
 msgid "Italian"
 msgstr "意大利语"
 
-#: include/functions.inc:2864
+#: include/functions.inc:2867
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: include/functions.inc:2865
+#: include/functions.inc:2868
 msgid "English"
 msgstr "英语"
 
-#: include/functions.inc:2866
+#: include/functions.inc:2869
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: include/functions.inc:2867
+#: include/functions.inc:2870
 msgid "Polish"
 msgstr "波兰语"
 
-#: include/functions.inc:2869
+#: include/functions.inc:2872
 msgid "Chinese"
 msgstr "芯片组"
 
-#: include/functions.inc:2870
+#: include/functions.inc:2873
 #, fuzzy
 msgid "Vietnamese"
 msgstr "名"
 
-#: include/functions.inc:2871
+#: include/functions.inc:2874
 msgid "Russian"
 msgstr "俄语"
 
-#: include/functions.inc:3066
+#: include/functions.inc:3072
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s'，作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
 
-#: include/functions.inc:3099
+#: include/functions.inc:3105
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3112
+#: include/functions.inc:3118
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: include/functions.inc:3393 include/functions.inc:3407
-#: include/functions.inc:3445 include/functions.inc:3457
-#: include/functions.inc:3461 include/functions.inc:3476
-#: include/functions.inc:3485
+#: include/functions.inc:3399 include/functions.inc:3413
+#: include/functions.inc:3451 include/functions.inc:3463
+#: include/functions.inc:3467 include/functions.inc:3482
+#: include/functions.inc:3491
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "太多用户，无法分配一个可用的 ID！"
 
-#: include/functions.inc:3393
+#: include/functions.inc:3399
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3407
+#: include/functions.inc:3413
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3437
+#: include/functions.inc:3443
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "转到根部门"
 
-#: include/functions.inc:3445
+#: include/functions.inc:3451
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3457 include/functions.inc:3461
+#: include/functions.inc:3463 include/functions.inc:3467
 #, fuzzy
 msgid "no ID available!"
 msgstr "文件可用。"
 
-#: include/functions.inc:3485
+#: include/functions.inc:3491
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3545
+#: include/functions.inc:3551
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "太多用户，无法分配一个可用的 ID！"
@@ -1680,7 +1683,7 @@ msgstr ""
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
 #: plugins/admin/departments/class_department.inc:359
-#: plugins/admin/departments/class_department.inc:666
+#: plugins/admin/departments/class_department.inc:664
 #: plugins/admin/departments/organization.tpl:19
 #: plugins/admin/acl/class_aclRole.inc:735 plugins/admin/acl/acl-list.xml:57
 #: plugins/admin/acl/acl_role.tpl:17
@@ -1803,37 +1806,37 @@ msgstr "参数"
 msgid "Search in subtrees"
 msgstr "在子树中查找"
 
-#: include/class_plugin.inc:521
+#: include/class_plugin.inc:527
 msgid ""
 "The object has changed since opened in GOsa. All changes that may be done by "
 "others get lost if you save this entry!"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1844
+#: include/class_plugin.inc:1968
 msgid "from"
 msgstr "从"
 
-#: include/class_plugin.inc:1845 setup/class_setupStep_Migrate.inc:1250
+#: include/class_plugin.inc:1969 setup/class_setupStep_Migrate.inc:1250
 #: setup/class_setupStep_Migrate.inc:1300
 #: setup/class_setupStep_Migrate.inc:1348
 #, fuzzy
 msgid "to"
 msgstr "停止"
 
-#: include/class_plugin.inc:2028 include/class_plugin.inc:2030
+#: include/class_plugin.inc:2152 include/class_plugin.inc:2154
 #, fuzzy
 msgid "Restore"
 msgstr "仓库"
 
-#: include/class_plugin.inc:2072
+#: include/class_plugin.inc:2196
 msgid "cut"
 msgstr "剪切"
 
-#: include/class_plugin.inc:2080
+#: include/class_plugin.inc:2204
 msgid "copy"
 msgstr "复制"
 
@@ -2154,8 +2157,8 @@ msgstr "删除打印机扩展"
 #: include/utils/class_msgPool.inc:336
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
 #: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:83
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:253
+#: plugins/personal/generic/generic.tpl:271
 #: setup/class_setupStep_Migrate.inc:2869
 #, php-format
 msgid "Add"
@@ -2483,14 +2486,19 @@ msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1055
+#: include/class_ldap.inc:890
+#, php-format
+msgid "Missing command line programm '%s'!"
+msgstr ""
+
+#: include/class_ldap.inc:1052
 #, php-format
 msgid ""
 "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:1084
+#: include/class_ldap.inc:1081
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "导入 dn: '%s' 时错误，请从行 %s 开始检查您的 LDIF！"
@@ -2567,7 +2575,7 @@ msgstr ""
 #: include/class_pluglist.inc:316
 #: plugins/admin/departments/class_department.inc:145
 #: plugins/personal/generic/class_user.inc:273
-#: plugins/personal/generic/class_user.inc:1872
+#: plugins/personal/generic/class_user.inc:1864
 msgid "Unknown"
 msgstr "未知"
 
@@ -2621,10 +2629,10 @@ msgstr "请看一下 GOsa 日志文件。"
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:966
 #: plugins/admin/groups/class_group.inc:1174
-#: plugins/admin/users/class_userManagement.inc:870
-#: plugins/admin/departments/class_department.inc:656
+#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/departments/class_department.inc:654
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1668
+#: plugins/personal/generic/class_user.inc:1660
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "通用配置"
@@ -2637,7 +2645,7 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:877
+#: plugins/admin/users/class_userManagement.inc:878
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "邮件"
@@ -2645,14 +2653,14 @@ msgstr "邮件"
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:882
+#: plugins/admin/users/class_userManagement.inc:883
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:894
+#: plugins/admin/users/class_userManagement.inc:895
 msgid "FAX"
 msgstr "传真"
 
@@ -2682,8 +2690,8 @@ msgstr "组"
 #: plugins/admin/departments/dep-list.xml:71
 #: plugins/admin/departments/dep-list.xml:138
 #: plugins/admin/departments/class_departmentManagement.inc:249
-#: plugins/personal/generic/class_user.inc:1695
-#: plugins/personal/generic/generic.tpl:307
+#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/generic.tpl:309
 msgid "Department"
 msgstr "部门"
 
@@ -2691,14 +2699,14 @@ msgstr "部门"
 #: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:898
+#: plugins/admin/users/class_userManagement.inc:899
 #: plugins/admin/departments/generic.tpl:106
 #: plugins/admin/departments/class_department.inc:370
 #: plugins/admin/departments/organization.tpl:105
-#: plugins/personal/generic/class_user.inc:1356
-#: plugins/personal/generic/class_user.inc:1819
-#: plugins/personal/generic/generic.tpl:398
-#: plugins/personal/generic/generic.tpl:579
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/class_user.inc:1811
+#: plugins/personal/generic/generic.tpl:400
+#: plugins/personal/generic/generic.tpl:581
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "电话"
@@ -2821,8 +2829,8 @@ msgstr "用户"
 #: plugins/admin/groups/class_group.inc:1089
 #: plugins/admin/groups/class_group.inc:1096
 #: plugins/admin/groups/class_group.inc:1183
-#: plugins/admin/users/class_userManagement.inc:538
-#: plugins/admin/users/class_userManagement.inc:585
+#: plugins/admin/users/class_userManagement.inc:539
+#: plugins/admin/users/class_userManagement.inc:586
 #: plugins/admin/users/user-filter.tpl:24
 #: plugins/admin/departments/class_domain.inc:47
 #: plugins/admin/departments/class_domain.inc:49
@@ -2830,7 +2838,7 @@ msgstr "用户"
 #: plugins/admin/departments/class_domain.inc:56
 #: plugins/admin/departments/class_domain.inc:58
 #: plugins/admin/departments/class_domain.inc:90
-#: plugins/admin/departments/dep-filter.tpl:13
+#: plugins/admin/departments/dep-filter.tpl:15
 #: plugins/admin/departments/class_localityGeneric.inc:48
 #: plugins/admin/departments/class_localityGeneric.inc:50
 #: plugins/admin/departments/class_localityGeneric.inc:55
@@ -2862,10 +2870,10 @@ msgstr "用户"
 #: plugins/admin/acl/class_aclRole.inc:755 plugins/admin/acl/acl-list.xml:49
 #: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl-filter.tpl:21
 #: plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1336
-#: plugins/personal/generic/class_user.inc:1378
-#: plugins/personal/generic/class_user.inc:1834
+#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1826
 #: plugins/personal/posix/trustSelect/trust-list.xml:56
 #: plugins/personal/posix/trustSelect/trust-filter.tpl:23
 #: plugins/personal/posix/groupSelect/group-filter.tpl:21
@@ -2895,13 +2903,13 @@ msgstr "名称"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:668
+#: plugins/admin/departments/class_department.inc:666
 #: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
 #: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:734
 #: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1688
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/class_user.inc:1680
+#: plugins/personal/generic/generic.tpl:166
 #: plugins/personal/posix/trustSelect/trust-list.tpl:13
 #: plugins/personal/posix/groupSelect/group-list.tpl:13
 #: setup/setup_ldap.tpl:55
@@ -3003,9 +3011,9 @@ msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:354
-#: plugins/admin/users/class_userManagement.inc:463
-#: plugins/admin/users/class_userManagement.inc:497
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:464
+#: plugins/admin/users/class_userManagement.inc:498
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "none"
 msgstr "无"
 
@@ -3160,7 +3168,7 @@ msgstr "自动化安装说明"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:890
+#: plugins/admin/users/class_userManagement.inc:891
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
@@ -3341,25 +3349,25 @@ msgstr ""
 
 #: plugins/admin/groups/userSelect/user-list.xml:40
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:40
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:542
 #: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1328
-#: plugins/personal/generic/class_user.inc:1375
-#: plugins/personal/generic/class_user.inc:1680
-#: plugins/personal/generic/class_user.inc:1831
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/class_user.inc:1672
+#: plugins/personal/generic/class_user.inc:1823
 msgid "Given name"
 msgstr "名"
 
 #: plugins/admin/groups/userSelect/user-list.xml:48
 #: plugins/admin/groups/singleUserSelect/singleUser-list.xml:48
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1679
+#: plugins/personal/generic/class_user.inc:1671
 msgid "Surname"
 msgstr "姓"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
-#: plugins/personal/generic/generic.tpl:73
-#: plugins/personal/generic/generic.tpl:89
+#: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:54
+#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/generic.tpl:91
 msgid "Multiple edit"
 msgstr ""
 
@@ -3582,19 +3590,19 @@ msgid "Edit posix properties"
 msgstr "编辑电话属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:165
-#: plugins/admin/users/class_userManagement.inc:879
+#: plugins/admin/users/class_userManagement.inc:880
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "编辑邮件属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:173
-#: plugins/admin/users/class_userManagement.inc:883
+#: plugins/admin/users/class_userManagement.inc:884
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "编辑 samba 属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:181
-#: plugins/admin/users/class_userManagement.inc:899
+#: plugins/admin/users/class_userManagement.inc:900
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "编辑电话属性"
@@ -3612,7 +3620,7 @@ msgid "Edit start menu properties"
 msgstr "编辑 samba 属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:891
+#: plugins/admin/users/class_userManagement.inc:892
 #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "编辑环境属性"
@@ -3640,15 +3648,15 @@ msgid ""
 "and unix services."
 msgstr "修改口令将影响邮件，代理，samba，unix等的登录。"
 
-#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:57
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/password.tpl:64
 #: plugins/personal/generic/password.tpl:27
-#: plugins/personal/generic/password.tpl:70
+#: plugins/personal/generic/password.tpl:77
 #: plugins/personal/password/password.tpl:32
-#: plugins/personal/password/password.tpl:75
+#: plugins/personal/password/password.tpl:83
 msgid "Repeat new password"
 msgstr "重复新口令"
 
-#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:61
+#: plugins/admin/users/password.tpl:25 plugins/admin/users/password.tpl:68
 #, fuzzy
 msgid "Strength"
 msgstr "街道"
@@ -3665,29 +3673,29 @@ msgstr "口令"
 msgid "Use proposal"
 msgstr "组"
 
-#: plugins/admin/users/password.tpl:43
-#: plugins/personal/generic/password.tpl:55
-#: plugins/personal/password/password.tpl:60 setup/setup_migrate.tpl:470
+#: plugins/admin/users/password.tpl:50
+#: plugins/personal/generic/password.tpl:62
+#: plugins/personal/password/password.tpl:68 setup/setup_migrate.tpl:470
 #: setup/setup_migrate.tpl:513 setup/setup_migrate.tpl:557
 #, fuzzy
 msgid "Refresh"
 msgstr "参考"
 
-#: plugins/admin/users/password.tpl:49
-#: plugins/personal/generic/password.tpl:61
-#: plugins/personal/password/password.tpl:66
+#: plugins/admin/users/password.tpl:56
+#: plugins/personal/generic/password.tpl:68
+#: plugins/personal/password/password.tpl:74
 #, fuzzy
 msgid "Manually specify a password"
 msgstr "请输入您的口令！"
 
-#: plugins/admin/users/password.tpl:77
+#: plugins/admin/users/password.tpl:84
 #, fuzzy
 msgid "Enforce password change on next login."
 msgstr "不允许修改口令"
 
-#: plugins/admin/users/password.tpl:84
-#: plugins/personal/generic/password.tpl:88
-#: plugins/personal/password/password.tpl:93
+#: plugins/admin/users/password.tpl:91
+#: plugins/personal/generic/password.tpl:95
+#: plugins/personal/password/password.tpl:101
 msgid "Set password"
 msgstr "设置口令"
 
@@ -3705,18 +3713,18 @@ msgstr ""
 "板选择。"
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:535
+#: plugins/admin/users/class_userManagement.inc:536
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
 msgstr "模板"
 
-#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
+#: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:51
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
 msgstr "姓"
 
-#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:69
+#: plugins/admin/users/template.tpl:27 plugins/personal/generic/generic.tpl:71
 #: plugins/personal/generic/paste_generic.tpl:11
 msgid "First name"
 msgstr "名"
@@ -3726,38 +3734,38 @@ msgstr "名"
 msgid "Manage users"
 msgstr "域用户"
 
-#: plugins/admin/users/class_userManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:392
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "您无权修改您的口令。"
 
-#: plugins/admin/users/class_userManagement.inc:782
+#: plugins/admin/users/class_userManagement.inc:783
 #, fuzzy
 msgid "Account locking"
 msgstr "账户"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:784
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:857
 #, fuzzy
 msgid "Unlock account"
 msgstr "我的账号"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:859
 #, fuzzy
 msgid "Lock account"
 msgstr "我的账号"
 
-#: plugins/admin/users/class_userManagement.inc:871
+#: plugins/admin/users/class_userManagement.inc:872
 msgid "Edit generic properties"
 msgstr "编辑通用属性"
 
-#: plugins/admin/users/class_userManagement.inc:874
+#: plugins/admin/users/class_userManagement.inc:875
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3765,20 +3773,20 @@ msgstr "编辑通用属性"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:875
+#: plugins/admin/users/class_userManagement.inc:876
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "编辑 UNIX 属性"
 
-#: plugins/admin/users/class_userManagement.inc:886
+#: plugins/admin/users/class_userManagement.inc:887
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:887
+#: plugins/admin/users/class_userManagement.inc:888
 msgid "Edit netatalk properties"
 msgstr "编辑 netatalk 属性"
 
-#: plugins/admin/users/class_userManagement.inc:895
+#: plugins/admin/users/class_userManagement.inc:896
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "编辑 UNIX 属性"
@@ -3917,8 +3925,8 @@ msgstr "位置"
 #: plugins/admin/departments/class_departmentManagement.inc:237
 #: plugins/admin/departments/class_organizationGeneric.inc:113
 #: plugins/admin/departments/class_organizationGeneric.inc:114
-#: plugins/personal/generic/class_user.inc:1694
-#: plugins/personal/generic/generic.tpl:299 setup/setup_feedback.tpl:23
+#: plugins/personal/generic/class_user.inc:1686
+#: plugins/personal/generic/generic.tpl:301 setup/setup_feedback.tpl:23
 msgid "Organization"
 msgstr "组织/公司"
 
@@ -3952,11 +3960,11 @@ msgstr "部门描述文件"
 #: plugins/admin/departments/domain.tpl:39
 #: plugins/admin/departments/country.tpl:39
 #: plugins/admin/departments/dcObject.tpl:39
-#: plugins/admin/departments/class_department.inc:675
+#: plugins/admin/departments/class_department.inc:673
 #: plugins/admin/departments/organization.tpl:51
-#: plugins/personal/generic/class_user.inc:1697
-#: plugins/personal/generic/generic.tpl:340
-#: plugins/personal/generic/generic.tpl:361
+#: plugins/personal/generic/class_user.inc:1689
+#: plugins/personal/generic/generic.tpl:342
+#: plugins/personal/generic/generic.tpl:363
 #, fuzzy
 msgid "Manager"
 msgstr "域用户"
@@ -3971,7 +3979,7 @@ msgstr "域用户"
 #: plugins/admin/departments/domain.tpl:67
 #: plugins/admin/departments/country.tpl:67
 #: plugins/admin/departments/dcObject.tpl:67
-#: plugins/admin/departments/class_department.inc:677
+#: plugins/admin/departments/class_department.inc:675
 #: plugins/admin/departments/organization.tpl:131
 msgid "Administrative settings"
 msgstr "管理设置"
@@ -4000,7 +4008,7 @@ msgstr "部门描述文件"
 
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:667
+#: plugins/admin/departments/class_department.inc:665
 #: plugins/admin/departments/organization.tpl:27
 msgid "Category"
 msgstr "分类"
@@ -4014,20 +4022,20 @@ msgstr "这个子树的分类"
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_localityGeneric.inc:91
 #: plugins/admin/departments/class_organizationGeneric.inc:130
-#: plugins/admin/departments/class_department.inc:671
+#: plugins/admin/departments/class_department.inc:669
 #: plugins/admin/departments/organization.tpl:78
 #: plugins/admin/departments/organization.tpl:90
-#: plugins/personal/generic/class_user.inc:1708
-#: plugins/personal/generic/generic.tpl:441
+#: plugins/personal/generic/class_user.inc:1700
+#: plugins/personal/generic/generic.tpl:443
 msgid "Location"
 msgstr "位置"
 
 #: plugins/admin/departments/generic.tpl:83
 #: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_department.inc:670
+#: plugins/admin/departments/class_department.inc:668
 #: plugins/admin/departments/organization.tpl:82
-#: plugins/personal/generic/class_user.inc:1707
-#: plugins/personal/generic/generic.tpl:449
+#: plugins/personal/generic/class_user.inc:1699
+#: plugins/personal/generic/generic.tpl:451
 msgid "State"
 msgstr "州/省"
 
@@ -4042,10 +4050,10 @@ msgid "Location of this subtree"
 msgstr "这个子树的位置"
 
 #: plugins/admin/departments/generic.tpl:99
-#: plugins/admin/departments/class_department.inc:672
+#: plugins/admin/departments/class_department.inc:670
 #: plugins/admin/departments/organization.tpl:98
-#: plugins/personal/generic/generic.tpl:183
-#: plugins/personal/generic/generic.tpl:457
+#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:459
 msgid "Address"
 msgstr "住址"
 
@@ -4062,12 +4070,12 @@ msgstr "这个子树的电话号码"
 #: plugins/admin/departments/generic.tpl:114
 #: plugins/admin/departments/class_organizationGeneric.inc:133
 #: plugins/admin/departments/class_department.inc:373
-#: plugins/admin/departments/class_department.inc:674
+#: plugins/admin/departments/class_department.inc:672
 #: plugins/admin/departments/organization.tpl:113
-#: plugins/personal/generic/class_user.inc:1359
-#: plugins/personal/generic/class_user.inc:1822
-#: plugins/personal/generic/generic.tpl:423
-#: plugins/personal/generic/generic.tpl:591
+#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1814
+#: plugins/personal/generic/generic.tpl:425
+#: plugins/personal/generic/generic.tpl:593
 msgid "Fax"
 msgstr "传真"
 
@@ -4086,8 +4094,8 @@ msgid "Domain Component"
 msgstr "域管理员"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:657
-#: plugins/admin/departments/class_department.inc:662
+#: plugins/admin/departments/class_department.inc:655
+#: plugins/admin/departments/class_department.inc:660
 msgid "Departments"
 msgstr "部门"
 
@@ -4109,7 +4117,7 @@ msgid "Organization name"
 msgstr "组织/公司"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:131
-#: plugins/personal/generic/class_user.inc:1709
+#: plugins/personal/generic/class_user.inc:1701
 msgid "Postal address"
 msgstr "地址"
 
@@ -4143,40 +4151,40 @@ msgstr "要创建子树的名称"
 msgid "Cannot find an unused tag for this administrative unit!"
 msgstr "致命错误：无法找到一个未使用的标志来标记管理单元！"
 
-#: plugins/admin/departments/class_department.inc:504
+#: plugins/admin/departments/class_department.inc:502
 #, php-format
 msgid "Tagging '%s'."
 msgstr "标记 '%s'。"
 
-#: plugins/admin/departments/class_department.inc:585
+#: plugins/admin/departments/class_department.inc:583
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr "移动 '%s' 到 '%s'"
 
-#: plugins/admin/departments/class_department.inc:626
+#: plugins/admin/departments/class_department.inc:624
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr "拷贝 %s 失败，退出操作"
 
-#: plugins/admin/departments/class_department.inc:665
+#: plugins/admin/departments/class_department.inc:663
 msgid "Department name"
 msgstr "部门名称"
 
-#: plugins/admin/departments/class_department.inc:673
+#: plugins/admin/departments/class_department.inc:671
 msgid "Telephone"
 msgstr "电话"
 
-#: plugins/admin/departments/class_department.inc:728
+#: plugins/admin/departments/class_department.inc:726
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr "对象 '%s' 已经做标记"
 
-#: plugins/admin/departments/class_department.inc:735
+#: plugins/admin/departments/class_department.inc:733
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr "添加标识（%s）到对象 '%s'"
 
-#: plugins/admin/departments/class_department.inc:767
+#: plugins/admin/departments/class_department.inc:765
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr "从对象 '%s' 删除标记"
@@ -4290,8 +4298,8 @@ msgstr "这个共享不能被删除，因为仍然被 %d 个用户使用："
 
 #: plugins/admin/acl/class_aclRole.inc:725 plugins/admin/acl/acl-list.xml:23
 #: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1664
-#: plugins/personal/generic/generic.tpl:508
+#: plugins/personal/generic/class_user.inc:1656
+#: plugins/personal/generic/generic.tpl:510
 msgid "Role"
 msgstr "角色"
 
@@ -4379,219 +4387,225 @@ msgstr "未安装证书"
 msgid "The selected password method is no longer available."
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1190
+#: plugins/personal/generic/class_user.inc:1038
+msgid ""
+"Cannot save user picture, GOsa requires the package 'imagemagick' or 'php5-"
+"imagick' to be installed!"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1197
+#: plugins/personal/generic/class_user.inc:1183
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1215
+#: plugins/personal/generic/class_user.inc:1201
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1286
+#: plugins/personal/generic/class_user.inc:1272
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1351
-#: plugins/personal/generic/class_user.inc:1713
-#: plugins/personal/generic/class_user.inc:1816
-#: plugins/personal/generic/generic.tpl:199
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1808
+#: plugins/personal/generic/generic.tpl:201
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:1362
-#: plugins/personal/generic/class_user.inc:1825
-#: plugins/personal/generic/generic.tpl:407
+#: plugins/personal/generic/class_user.inc:1348
+#: plugins/personal/generic/class_user.inc:1817
+#: plugins/personal/generic/generic.tpl:409
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:1365
-#: plugins/personal/generic/class_user.inc:1828
-#: plugins/personal/generic/generic.tpl:415
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/personal/generic/class_user.inc:1820
+#: plugins/personal/generic/generic.tpl:417
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:1370
-#: plugins/personal/generic/class_user.inc:1685
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1677
+#: plugins/personal/generic/generic.tpl:121
 msgid "Date of birth"
 msgstr "生日"
 
-#: plugins/personal/generic/class_user.inc:1485
+#: plugins/personal/generic/class_user.inc:1471
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "无法打开指定证书！"
 
-#: plugins/personal/generic/class_user.inc:1653
-#: plugins/personal/generic/generic.tpl:531
+#: plugins/personal/generic/class_user.inc:1645
+#: plugins/personal/generic/generic.tpl:533
 msgid "Unit"
 msgstr "单元"
 
-#: plugins/personal/generic/class_user.inc:1654
-#: plugins/personal/generic/generic.tpl:556
+#: plugins/personal/generic/class_user.inc:1646
+#: plugins/personal/generic/generic.tpl:558
 msgid "House identifier"
 msgstr "家庭角色"
 
-#: plugins/personal/generic/class_user.inc:1655
-#: plugins/personal/generic/generic.tpl:473
+#: plugins/personal/generic/class_user.inc:1647
+#: plugins/personal/generic/generic.tpl:475
 msgid "Vocation"
 msgstr "行业"
 
-#: plugins/personal/generic/class_user.inc:1656
-#: plugins/personal/generic/generic.tpl:600
+#: plugins/personal/generic/class_user.inc:1648
+#: plugins/personal/generic/generic.tpl:602
 msgid "Last delivery"
 msgstr "最后传递"
 
-#: plugins/personal/generic/class_user.inc:1657
-#: plugins/personal/generic/generic.tpl:522
+#: plugins/personal/generic/class_user.inc:1649
+#: plugins/personal/generic/generic.tpl:524
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1658
-#: plugins/personal/generic/generic.tpl:481
+#: plugins/personal/generic/class_user.inc:1650
+#: plugins/personal/generic/generic.tpl:483
 msgid "Unit description"
 msgstr "单元描述"
 
-#: plugins/personal/generic/class_user.inc:1659
-#: plugins/personal/generic/generic.tpl:490
+#: plugins/personal/generic/class_user.inc:1651
+#: plugins/personal/generic/generic.tpl:492
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1660
-#: plugins/personal/generic/generic.tpl:499
+#: plugins/personal/generic/class_user.inc:1652
+#: plugins/personal/generic/generic.tpl:501
 msgid "Functional title"
 msgstr "单位职称"
 
-#: plugins/personal/generic/class_user.inc:1661
+#: plugins/personal/generic/class_user.inc:1653
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "证书系列号"
 
-#: plugins/personal/generic/class_user.inc:1662
-#: plugins/personal/generic/generic.tpl:609
+#: plugins/personal/generic/class_user.inc:1654
+#: plugins/personal/generic/generic.tpl:611
 msgid "Public visible"
 msgstr "公开"
 
-#: plugins/personal/generic/class_user.inc:1663
-#: plugins/personal/generic/generic.tpl:540
+#: plugins/personal/generic/class_user.inc:1655
+#: plugins/personal/generic/generic.tpl:542
 msgid "Street"
 msgstr "街道"
 
-#: plugins/personal/generic/class_user.inc:1665
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1657
+#: plugins/personal/generic/generic.tpl:550
 msgid "Postal code"
 msgstr "邮编"
 
-#: plugins/personal/generic/class_user.inc:1669
+#: plugins/personal/generic/class_user.inc:1661
 #, fuzzy
 msgid "Generic user settings"
 msgstr "通用队列设置"
 
-#: plugins/personal/generic/class_user.inc:1673
-#: plugins/personal/posix/class_posixAccount.inc:1455
-#: plugins/personal/password/class_password.inc:205
+#: plugins/personal/generic/class_user.inc:1665
+#: plugins/personal/posix/class_posixAccount.inc:1452
+#: plugins/personal/password/class_password.inc:208
 msgid "My account"
 msgstr "我的账号"
 
-#: plugins/personal/generic/class_user.inc:1681
+#: plugins/personal/generic/class_user.inc:1673
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: plugins/personal/generic/class_user.inc:1682
-#: plugins/personal/generic/generic.tpl:98
+#: plugins/personal/generic/class_user.inc:1674
+#: plugins/personal/generic/generic.tpl:100
 msgid "Personal title"
 msgstr "个人称谓"
 
-#: plugins/personal/generic/class_user.inc:1683
-#: plugins/personal/generic/generic.tpl:108
+#: plugins/personal/generic/class_user.inc:1675
+#: plugins/personal/generic/generic.tpl:110
 msgid "Academic title"
 msgstr "学位头衔"
 
-#: plugins/personal/generic/class_user.inc:1686
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/class_user.inc:1678
+#: plugins/personal/generic/generic.tpl:140
 msgid "Sex"
 msgstr "性别"
 
-#: plugins/personal/generic/class_user.inc:1687
+#: plugins/personal/generic/class_user.inc:1679
 #, fuzzy
 msgid "Preferred language"
 msgstr "首选语种"
 
-#: plugins/personal/generic/class_user.inc:1690
+#: plugins/personal/generic/class_user.inc:1682
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "用户图片"
 
-#: plugins/personal/generic/class_user.inc:1692
+#: plugins/personal/generic/class_user.inc:1684
 #, fuzzy
 msgid "Login restrictions"
 msgstr "口令过期截止日"
 
-#: plugins/personal/generic/class_user.inc:1696
+#: plugins/personal/generic/class_user.inc:1688
 #, fuzzy
 msgid "Department number"
 msgstr "部门名称"
 
-#: plugins/personal/generic/class_user.inc:1698
+#: plugins/personal/generic/class_user.inc:1690
 #, fuzzy
 msgid "Employee number"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1699
-#: plugins/personal/generic/generic.tpl:331
+#: plugins/personal/generic/class_user.inc:1691
+#: plugins/personal/generic/generic.tpl:333
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1701
+#: plugins/personal/generic/class_user.inc:1693
 #, fuzzy
 msgid "Room number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1702
+#: plugins/personal/generic/class_user.inc:1694
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1703
+#: plugins/personal/generic/class_user.inc:1695
 #, fuzzy
 msgid "Pager number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1704
+#: plugins/personal/generic/class_user.inc:1696
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1705
+#: plugins/personal/generic/class_user.inc:1697
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: plugins/personal/generic/class_user.inc:1711
+#: plugins/personal/generic/class_user.inc:1703
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:1712
+#: plugins/personal/generic/class_user.inc:1704
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1714
+#: plugins/personal/generic/class_user.inc:1706
 #, fuzzy
 msgid "User password method"
 msgstr "口令存储"
 
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1707
 #, fuzzy
 msgid "User certificates"
 msgstr "编辑证书"
 
-#: plugins/personal/generic/class_user.inc:1923
+#: plugins/personal/generic/class_user.inc:1915
 #, fuzzy
 msgid "Entries differ"
 msgstr "每页条目数"
@@ -4607,72 +4621,71 @@ msgstr "您已经成功更改口令。还要记住更改相关程序设定。"
 msgid "Personal information"
 msgstr "个人信息"
 
-#: plugins/personal/generic/generic.tpl:20
-#: plugins/personal/generic/generic.tpl:22
-#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic.tpl:21
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/personal/generic/generic.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:37
 #: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
 msgid "Personal picture"
 msgstr "个人图片"
 
-#: plugins/personal/generic/generic.tpl:29
-#: plugins/personal/generic/generic.tpl:40
+#: plugins/personal/generic/generic.tpl:31
+#: plugins/personal/generic/generic.tpl:42
 msgid "Change picture"
 msgstr "更换图片"
 
-#: plugins/personal/generic/generic.tpl:62
+#: plugins/personal/generic/generic.tpl:64
 msgid "Template name"
 msgstr "模板名称"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:153
 msgid "Preferred langage"
 msgstr "首选语种"
 
-#: plugins/personal/generic/generic.tpl:191
+#: plugins/personal/generic/generic.tpl:193
 msgid "Private phone"
 msgstr "私人电话"
 
-#: plugins/personal/generic/generic.tpl:212
+#: plugins/personal/generic/generic.tpl:214
 msgid "Password storage"
 msgstr "口令存储"
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "证书"
 
-#: plugins/personal/generic/generic.tpl:232
+#: plugins/personal/generic/generic.tpl:234
 msgid "Edit certificates"
 msgstr "编辑证书"
 
-#: plugins/personal/generic/generic.tpl:244
+#: plugins/personal/generic/generic.tpl:246
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:250
-#: plugins/personal/generic/generic.tpl:266
+#: plugins/personal/generic/generic.tpl:252
+#: plugins/personal/generic/generic.tpl:268
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/generic.tpl:289
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/generic.tpl:315
+#: plugins/personal/generic/generic.tpl:317
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:325
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/generic.tpl:571
+#: plugins/personal/generic/generic.tpl:391
+#: plugins/personal/generic/generic.tpl:573
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/generic.tpl:585
+#: plugins/personal/generic/generic.tpl:587
 msgid "Please use the phone tab"
 msgstr "请使用电话页面"
 
@@ -4713,8 +4726,8 @@ msgstr ""
 msgid "Password change dialog"
 msgstr "不允许修改口令"
 
-#: plugins/personal/generic/password.tpl:90
-#: plugins/personal/password/password.tpl:95
+#: plugins/personal/generic/password.tpl:97
+#: plugins/personal/password/password.tpl:103
 msgid "Clear fields"
 msgstr "清除字段"
 
@@ -4813,7 +4826,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:1030
 #: plugins/personal/posix/class_posixAccount.inc:1105
 #: plugins/personal/posix/class_posixAccount.inc:1108
-#: plugins/personal/posix/class_posixAccount.inc:1461
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
@@ -4849,60 +4862,60 @@ msgstr "显示分区"
 msgid "shadowInactive"
 msgstr "显示打印机"
 
-#: plugins/personal/posix/class_posixAccount.inc:1451
+#: plugins/personal/posix/class_posixAccount.inc:1448
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI 账号"
 
-#: plugins/personal/posix/class_posixAccount.inc:1462
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1463
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "用户 ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1464
+#: plugins/personal/posix/class_posixAccount.inc:1461
 #, fuzzy
 msgid "Group ID"
 msgstr "组"
 
-#: plugins/personal/posix/class_posixAccount.inc:1466
+#: plugins/personal/posix/class_posixAccount.inc:1463
 #, fuzzy
 msgid "Force password change on login"
 msgstr "不允许修改口令"
 
-#: plugins/personal/posix/class_posixAccount.inc:1467
+#: plugins/personal/posix/class_posixAccount.inc:1464
 #, fuzzy
 msgid "Shadow min"
 msgstr "显示终端"
 
-#: plugins/personal/posix/class_posixAccount.inc:1468
+#: plugins/personal/posix/class_posixAccount.inc:1465
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1469
+#: plugins/personal/posix/class_posixAccount.inc:1466
 #, fuzzy
 msgid "Shadow warning"
 msgstr "显示分区"
 
-#: plugins/personal/posix/class_posixAccount.inc:1470
+#: plugins/personal/posix/class_posixAccount.inc:1467
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "显示打印机"
 
-#: plugins/personal/posix/class_posixAccount.inc:1471
+#: plugins/personal/posix/class_posixAccount.inc:1468
 #, fuzzy
 msgid "Shadow expire"
 msgstr "显示人员"
 
-#: plugins/personal/posix/class_posixAccount.inc:1472
+#: plugins/personal/posix/class_posixAccount.inc:1469
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1473
+#: plugins/personal/posix/class_posixAccount.inc:1470
 #, fuzzy
 msgid "System trust model"
 msgstr "信赖的系统"
@@ -5026,31 +5039,31 @@ msgstr "您的口令已经过期 !! 选择一个新口令"
 msgid "Change user password"
 msgstr "修改口令"
 
-#: plugins/personal/password/class_password.inc:129
+#: plugins/personal/password/class_password.inc:115
 msgid "You need to specify your current password in order to proceed."
 msgstr "您需要输入当前口令才能继续。"
 
-#: plugins/personal/password/class_password.inc:135
+#: plugins/personal/password/class_password.inc:119
 msgid "The password you've entered as 'New password' is empty."
 msgstr "输入的“新口令”为空。"
 
-#: plugins/personal/password/class_password.inc:144
-#, fuzzy, php-format
-msgid "External password changer reported a problem: %s."
-msgstr "外部口令更改程序报告错误："
+#: plugins/personal/password/class_password.inc:140
+#, php-format
+msgid "Check-hook reported a problem: %s. Password change canceled!"
+msgstr ""
 
-#: plugins/personal/password/class_password.inc:158
+#: plugins/personal/password/class_password.inc:161
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "您输入的当前口令不正确。"
 
-#: plugins/personal/password/class_password.inc:164
+#: plugins/personal/password/class_password.inc:167
 #, fuzzy
 msgid "You have no permission to change your password."
 msgstr "您无权修改您的口令。"
 
-#: plugins/personal/password/class_password.inc:201
+#: plugins/personal/password/class_password.inc:204
 #, fuzzy
 msgid "User password"
 msgstr "清除口令"
@@ -6792,6 +6805,10 @@ msgstr ""
 msgid "Automatic"
 msgstr "自动"
 
+#, fuzzy
+#~ msgid "External password changer reported a problem: %s."
+#~ msgstr "外部口令更改程序报告错误："
+
 #, fuzzy
 #~ msgid "Group submenu menu"
 #~ msgstr "组成员"
diff --git a/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po
index 92beef70f..c606cb25d 100644
--- a/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2009-03-03 14:53+0100\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,16 +35,16 @@ msgid "Personal"
 msgstr "Persönlich"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Name"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Initialien"
@@ -67,20 +68,20 @@ msgstr "Adresse"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Telefon"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "Email"
@@ -96,7 +97,7 @@ msgid "Company"
 msgstr "Firma"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Abteilung"
@@ -122,8 +123,8 @@ msgid "FAX"
 msgstr "Fax"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pager"
@@ -152,19 +153,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Wähle Verbindung..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "Wählen"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Adressbuch"
 
@@ -180,169 +181,169 @@ msgstr "GOsa-bezogene Objekte"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Soll von %s nach %s gewählt werden?"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Um direkt wählen zu können müssen Sie zuerst Ihre persönliche Telefonnummer "
 "einstellen."
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Speichere Kontakt für %s als vcard"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "Sende eine Mail an %s"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "dem globalen Adressbuch"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr "Fax-Datenbank"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt wurde in '%s' abgelegt"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Erzeugen eines neuen Eintrags in"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "Alle"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Vorname"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Telefon (Arbeit)"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "Mobiltelefon"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Telefon (zu Hause)"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Fax"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Es kann kein eindeutiger DN für diesen Eintrag erzeugt werden. Füllen Sie "
 "bitte weitere Felder aus."
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addressbook entries"
 msgstr "Adressbuch-Einträge"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 msgid "Addressbook related objects"
 msgstr "Adressbuch-bezogene Objekte"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Zusätzliches"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr "Nachname"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Organisation"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Ort"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "Adresse"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Land"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "Titel"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "Name"
 
@@ -435,3 +436,6 @@ msgstr "Suche nach"
 #: addons/addressbook/contents.tpl:112
 msgid "Search string"
 msgstr "Suchtext"
+
+#~ msgid "Surename"
+#~ msgstr "Nachname"
diff --git a/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po
index 1f9912f20..9eeb555a5 100644
--- a/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2010-01-24 00:04+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,16 +33,16 @@ msgid "Personal"
 msgstr "Personal"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Nombre"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Iniciales"
@@ -65,20 +66,20 @@ msgstr "Dirección"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Teléfono"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "Móvil"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "Correo Electrónico"
@@ -94,7 +95,7 @@ msgid "Company"
 msgstr "Compañía"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Departamento"
@@ -120,8 +121,8 @@ msgid "FAX"
 msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Buscapersonas"
@@ -150,19 +151,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Marcando conexión..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "Marcar"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Libreta direcciones"
 
@@ -178,169 +179,169 @@ msgstr "Objetos relacionados con GOsa"
 msgid "This does something"
 msgstr "Esto hace algo"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "¿Llamar desde %s a %s ahora?"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr "Error"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Necesita introducir su número de teléfono personal para poder realizar "
 "llamadas directas."
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 msgid "Permission"
 msgstr "Permisos"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Salvar el contacto %s como una vcard"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "libreta de contactos global"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr "usuario de Base de datos"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contacto guardado en '%s'"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Creando una nueva entrada en"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "Todo"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Nombre de pila"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Teléfono de empresa"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "Teléfono Móvil"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 msgid "Telephone number"
 msgstr "Número de teléfono"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Fax"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "No se puede crear un 'DN' único para esta entrada. Por favor rellene los "
 "campos del formulario."
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addressbook entries"
 msgstr "Entradas en la libreta direcciones"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 msgid "Addressbook related objects"
 msgstr "Objetos relacionados con la libreta direcciones"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Añadidos"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
-msgstr "Apellidos"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
+msgstr "Apellido"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Organización"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Localización"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "Código Postal"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Provincia"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "Título"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "Nombre común"
 
@@ -434,6 +435,9 @@ msgstr "Buscar por"
 msgid "Search string"
 msgstr "Cadena de búsqueda"
 
+#~ msgid "Surename"
+#~ msgstr "Apellidos"
+
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
 
diff --git a/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po
index 76bb8ce86..bf389c30e 100644
--- a/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2009-02-28 13:55+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,16 +29,16 @@ msgid "Personal"
 msgstr "Personnel"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Nom"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Initiales"
@@ -61,20 +62,20 @@ msgstr "Adresse"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Téléphone"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "GSM"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "Adresse de messagerie"
@@ -90,7 +91,7 @@ msgid "Company"
 msgstr "Société"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Département"
@@ -116,8 +117,8 @@ msgid "FAX"
 msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Bip"
@@ -147,19 +148,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Appel en cours ..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "Appeler"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Carnet d'adresses"
 
@@ -175,169 +176,169 @@ msgstr "Objets liés à GOsa"
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Appeler de %s vers %s maintenant ?"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Vous n'avez pas de numéro de téléphone personnel indiqué. Veuillez rectifier "
 "cela afin de pouvoir faire des appels directs."
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 msgid "Permission"
 msgstr "Permissions"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Enregistrer le contact %s au format vcard"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "Envoyer un message à %s"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "Carnet d'adresses général"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr "Base de données des utilisateurs"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contact enregistré dans '%s'"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Création d'une nouvelle entrée dans"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "Tout"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Prénom"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Téléphone du bureau"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "GSM"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Téléphone personnel"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Fax"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Impossible de créer un DN unique pour cette entrée. Veuillez remplir plus de "
 "champs."
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addressbook entries"
 msgstr "Entrées du carnet d'adresses"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 msgid "Addressbook related objects"
 msgstr "objets liés au carnet d'adresse"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Extensions"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr "Nom de famille"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Entreprise"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Lieu"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "Adresse postale"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Département"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "Titre"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "Nom complet"
 
@@ -432,3 +433,6 @@ msgstr "Recherche de"
 #: addons/addressbook/contents.tpl:112
 msgid "Search string"
 msgstr "Phrase de recherche"
+
+#~ msgid "Surename"
+#~ msgstr "Nom de famille"
diff --git a/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po
index c6c2833eb..2e48accff 100644
--- a/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,16 +32,16 @@ msgid "Personal"
 msgstr "Personale"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Cognome"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Iniziali"
@@ -64,20 +65,20 @@ msgstr "Indirizzo"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Telefono"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "Cellulare"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "Indirizzo email"
@@ -93,7 +94,7 @@ msgid "Company"
 msgstr "Azienda"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Dipartimento"
@@ -119,8 +120,8 @@ msgid "FAX"
 msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pager"
@@ -148,10 +149,10 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Disconnessione "
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 #, fuzzy
 msgid "Dial"
 msgstr "disabilitato"
@@ -159,9 +160,9 @@ msgstr "disabilitato"
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Rubrica"
 
@@ -178,178 +179,178 @@ msgstr "Gruppo di oggetti"
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 #, fuzzy
 msgid "global addressbook"
 msgstr "Rubrica"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 #, fuzzy
 msgid "user database"
 msgstr "Database"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, fuzzy, php-format
 msgid "Contact stored in '%s'"
 msgstr "Rimuovi"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Crea in"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Nome"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Telefono del lavoro"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "Cellolare"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Telefono privato"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 #, fuzzy
 msgid "Telephone number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Fax"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Mostra contatti della rubrica"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Mostra contatti della rubrica"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Extra"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr "Cognome"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Località"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "CAP"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Stato"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "Titolo"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "Nome comune"
 
@@ -449,6 +450,9 @@ msgstr "Cerca"
 msgid "Search string"
 msgstr "Ricerca"
 
+#~ msgid "Surename"
+#~ msgstr "Cognome"
+
 #~ msgid "Cancel"
 #~ msgstr "Annulla"
 
diff --git a/gosa-plugins/addressbook/locale/messages.po b/gosa-plugins/addressbook/locale/messages.po
index 310a381c1..5056d1b1c 100644
--- a/gosa-plugins/addressbook/locale/messages.po
+++ b/gosa-plugins/addressbook/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,16 +31,16 @@ msgid "Personal"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr ""
@@ -63,20 +64,20 @@ msgstr ""
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr ""
@@ -92,7 +93,7 @@ msgid "Company"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr ""
@@ -118,8 +119,8 @@ msgid "FAX"
 msgstr ""
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr ""
@@ -143,19 +144,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr ""
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr ""
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr ""
 
@@ -171,165 +172,165 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 msgid "LDAP error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 msgid "Permission"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 msgid "Telephone number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addressbook entries"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 msgid "Addressbook related objects"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Telefon number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 msgid "Fax number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Mobile number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 msgid "Home phone number"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 msgid "User identification"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr ""
 
diff --git a/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po
index 8bc567e71..8d09af017 100644
--- a/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2008-06-09 17:54+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,16 +36,16 @@ msgid "Personal"
 msgstr "Persoonlijk"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Naam"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Initialen"
@@ -68,20 +69,20 @@ msgstr "Adres"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Telefoon"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "GSM"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "E-mail"
@@ -97,7 +98,7 @@ msgid "Company"
 msgstr "Bedrijf"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Afdeling"
@@ -123,8 +124,8 @@ msgid "FAX"
 msgstr "Fax"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pieper"
@@ -153,19 +154,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Bel..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "Kies"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Adresboek"
 
@@ -182,171 +183,171 @@ msgstr "Nieuw FAI object aanmaken"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Nu van %s naar %s bellen?"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr "Fout"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Er moet een privé telefoonnummer opgegeven zijn om direkt te kunnen bellen"
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Sla contact voor %s op als vcard"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "Stuur E-mail naar %s"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "globaal adresboek"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr "gebruiker database"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contact opgeslagen in '%s'"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Maak invoer aan in"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "Alle"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Voornaam"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Telefoon werk"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "GSM"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Telefoon privé"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 msgid "Telephone number"
 msgstr "Telefoonnummer"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Fax"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Kan geen unieke DN aanmaken voor uw invoer. Vul a.u.b. meer formulier velden "
 "in."
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Toon adresboek regels"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Adresboek invoer ACLs"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Plugins"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr "Achternaam"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 msgid "Fax number"
 msgstr "FAX nummer"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 msgid "Home phone number"
 msgstr "Prive nummer"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 msgid "User identification"
 msgstr "Gebruiker identificatie"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "E-mail adres"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Plaats"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "Postadres"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Provincie"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "Titel"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr "Postadres thuis"
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "Algemene naam"
 
@@ -440,3 +441,6 @@ msgstr "Zoek naar"
 #: addons/addressbook/contents.tpl:112
 msgid "Search string"
 msgstr "Zoekstring"
+
+#~ msgid "Surename"
+#~ msgstr "Achternaam"
diff --git a/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po
index 2187f102c..9d2e438dd 100644
--- a/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2009-09-05 15:16+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,16 +29,16 @@ msgid "Personal"
 msgstr "Osobiste"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Imię"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Inicjały"
@@ -61,20 +62,20 @@ msgstr "Adres"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Telefon"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "Komórka"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "Email"
@@ -90,7 +91,7 @@ msgid "Company"
 msgstr "Firma"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Departament"
@@ -116,8 +117,8 @@ msgid "FAX"
 msgstr "FAX"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Pager"
@@ -146,19 +147,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Połączenie dzwonienia..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "Dzwonienie"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Książka adresowa"
 
@@ -174,169 +175,169 @@ msgstr "Powiązane obiekty GOsa"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Zadzwonić teraz z '%s' do '%s'?"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr "Błąd"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "Musisz ustawić swój osobisty numer telefonu aby móc wykonywać bezpośrednie "
 "połączenia."
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Zapisz kontakt dla %s jako wizytówka"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "Wyślij email do %s"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "Globalna książka adresowa"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr "użyj bazy"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Kontakt zachowany w '%s'"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Tworzenie nowego elementu w"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "Wszystkie"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Imię"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Telefon do pracy"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "Numer telefonu komórkowego"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Telefon domowy"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 msgid "Telephone number"
 msgstr "Numer telefonu"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Fax"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Nie można utworzyć unikalnego DN dla tego elementu. Proszę wypełnić więcej "
 "pól formularza."
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 msgid "Addressbook entries"
 msgstr "Wpisy książki adresowej"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 msgid "Addressbook related objects"
 msgstr "Powiązane obiekty książki adresowej"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Dodatki"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr "Nazwisko"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "Adres email"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Stan"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "Tytuł"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "Nazwa potoczna"
 
@@ -430,6 +431,9 @@ msgstr "Szukaj dla"
 msgid "Search string"
 msgstr "Poszukiwany napis"
 
+#~ msgid "Surename"
+#~ msgstr "Nazwisko"
+
 #~ msgid "You're about to delete the entry %s."
 #~ msgstr "Zamierzasz usunąć element %s."
 
diff --git a/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po
index 8997bd95e..467ba9676 100644
--- a/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,16 +31,16 @@ msgid "Personal"
 msgstr "Контакт"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "Фамилия"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "Отчество"
@@ -63,20 +64,20 @@ msgstr "Адрес"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "Телефон"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "Мобильный"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "Email"
@@ -92,7 +93,7 @@ msgid "Company"
 msgstr "Компания"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "Подразделение"
@@ -118,8 +119,8 @@ msgid "FAX"
 msgstr "Факс"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "Пейджер"
@@ -148,19 +149,19 @@ msgstr ""
 msgid "Dial connection..."
 msgstr "Соединение..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "Звонок"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "Адресная книга"
 
@@ -177,183 +178,183 @@ msgstr "Объект группы"
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "Звоним с %s на %s?"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr ""
 "У вас нет персонального набора телефонов. Настройте это прежде чем звонить."
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Сохранить контактную информацию %s в формате vcard"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "Отправить %s сообщение по эл. почте"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "общая адресная книга"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 #, fuzzy
 msgid "user database"
 msgstr "Базы данных"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, fuzzy, php-format
 msgid "Contact stored in '%s'"
 msgstr "Контакт сохранен в %s"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "Создание нового объекта в"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "Все"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "Имя"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "Рабочий телефон"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "Сотовый телефон"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "Домашний телефон"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 #, fuzzy
 msgid "Telephone number"
 msgstr "Телефонные номера"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "Факс"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "Невозможно создать уникальный DN для объекта. Заполните все поля формы."
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "Показать объекты адресной книги"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "Показать объекты адресной книги"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "Дополнительно"
 
-#: addons/addressbook/class_addressbook.inc:862
+#: addons/addressbook/class_addressbook.inc:867
 #, fuzzy
-msgid "Surename"
+msgid "Surname"
 msgstr "Имя сервера"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 #, fuzzy
 msgid "Mail address"
 msgstr "MAC-адрес"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "Организация"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "Местоположение"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "Адм. единица"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 #, fuzzy
 msgid "Title"
 msgstr "Файлы"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr ""
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 #, fuzzy
 msgid "Common name"
 msgstr "Местоположение"
@@ -451,6 +452,10 @@ msgstr "Поиск"
 msgid "Search string"
 msgstr "Строка поиска"
 
+#, fuzzy
+#~ msgid "Surename"
+#~ msgstr "Имя сервера"
+
 #~ msgid "You're about to delete the entry %s."
 #~ msgstr "Вы собираетесь удалить объект %s."
 
diff --git a/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po
index 3db760521..ef8a097c8 100644
--- a/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/addressbook/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:28+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,16 +33,16 @@ msgid "Personal"
 msgstr "个人"
 
 #: addons/addressbook/address_info.tpl:24
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:698
-#: addons/addressbook/class_addressbook.inc:708
-#: addons/addressbook/class_addressbook.inc:735
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:703
+#: addons/addressbook/class_addressbook.inc:713
+#: addons/addressbook/class_addressbook.inc:740
 #: addons/addressbook/contents.tpl:14
 msgid "Name"
 msgstr "名称"
 
 #: addons/addressbook/address_info.tpl:32
-#: addons/addressbook/class_addressbook.inc:877
+#: addons/addressbook/class_addressbook.inc:882
 #: addons/addressbook/address_edit.tpl:48
 msgid "Initials"
 msgstr "中间名"
@@ -65,20 +66,20 @@ msgstr "住址"
 
 #: addons/addressbook/address_info.tpl:67
 #: addons/addressbook/address_info.tpl:163
-#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:721
 #: addons/addressbook/address_edit.tpl:94
 #: addons/addressbook/address_edit.tpl:221 addons/addressbook/contents.tpl:14
 msgid "Phone"
 msgstr "电话"
 
 #: addons/addressbook/address_info.tpl:75
-#: addons/addressbook/class_addressbook.inc:725
+#: addons/addressbook/class_addressbook.inc:730
 #: addons/addressbook/address_edit.tpl:106 addons/addressbook/contents.tpl:15
 msgid "Mobile"
 msgstr "手机"
 
 #: addons/addressbook/address_info.tpl:83
-#: addons/addressbook/class_addressbook.inc:740
+#: addons/addressbook/class_addressbook.inc:745
 #: addons/addressbook/address_edit.tpl:118
 msgid "Email"
 msgstr "邮件"
@@ -94,7 +95,7 @@ msgid "Company"
 msgstr "公司"
 
 #: addons/addressbook/address_info.tpl:117
-#: addons/addressbook/class_addressbook.inc:872
+#: addons/addressbook/class_addressbook.inc:877
 #: addons/addressbook/address_edit.tpl:155
 msgid "Department"
 msgstr "部门"
@@ -120,8 +121,8 @@ msgid "FAX"
 msgstr "传真"
 
 #: addons/addressbook/address_info.tpl:179
-#: addons/addressbook/class_addressbook.inc:728
-#: addons/addressbook/class_addressbook.inc:870
+#: addons/addressbook/class_addressbook.inc:733
+#: addons/addressbook/class_addressbook.inc:875
 #: addons/addressbook/address_edit.tpl:246
 msgid "Pager"
 msgstr "呼机"
@@ -147,19 +148,19 @@ msgstr "所以，如果您确定，请按“删除”继续，否则按“取消
 msgid "Dial connection..."
 msgstr "拨号中..."
 
-#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:463
-#: addons/addressbook/class_addressbook.inc:470
-#: addons/addressbook/class_addressbook.inc:474
-#: addons/addressbook/class_addressbook.inc:598
+#: addons/addressbook/dial.tpl:10 addons/addressbook/class_addressbook.inc:468
+#: addons/addressbook/class_addressbook.inc:475
+#: addons/addressbook/class_addressbook.inc:479
+#: addons/addressbook/class_addressbook.inc:603
 msgid "Dial"
 msgstr "拨号"
 
 #: addons/addressbook/class_addressbook.inc:11
 #: addons/addressbook/class_addressbook.inc:12
 #: addons/addressbook/class_addressbook.inc:23
-#: addons/addressbook/class_addressbook.inc:853
-#: addons/addressbook/class_addressbook.inc:854
-#: addons/addressbook/class_addressbook.inc:859 addons/addressbook/main.inc:43
+#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:859
+#: addons/addressbook/class_addressbook.inc:864 addons/addressbook/main.inc:43
 msgid "Addressbook"
 msgstr "地址簿"
 
@@ -177,176 +178,176 @@ msgstr "创建新 FAI 对象"
 msgid "This does something"
 msgstr "******"
 
-#: addons/addressbook/class_addressbook.inc:193
+#: addons/addressbook/class_addressbook.inc:197
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "现在从 %s 拨号到 %s 么？"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 msgid "Error"
 msgstr "错误"
 
-#: addons/addressbook/class_addressbook.inc:197
+#: addons/addressbook/class_addressbook.inc:201
 #, fuzzy
 msgid ""
 "You need to set your personal phone number in order to perform direct dials."
 msgstr "您尚未设置个人电话号码。要想使用直接拨号需要修改个人电话号码。"
 
-#: addons/addressbook/class_addressbook.inc:225
-#: addons/addressbook/class_addressbook.inc:799
+#: addons/addressbook/class_addressbook.inc:230
+#: addons/addressbook/class_addressbook.inc:804
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: addons/addressbook/class_addressbook.inc:233
-#: addons/addressbook/class_addressbook.inc:341
+#: addons/addressbook/class_addressbook.inc:238
+#: addons/addressbook/class_addressbook.inc:346
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
-#: addons/addressbook/class_addressbook.inc:480
+#: addons/addressbook/class_addressbook.inc:485
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "保存 %s 的内容为 vcard"
 
-#: addons/addressbook/class_addressbook.inc:486
+#: addons/addressbook/class_addressbook.inc:491
 #, php-format
 msgid "Send mail to %s"
 msgstr "发送邮件到 %s"
 
-#: addons/addressbook/class_addressbook.inc:610
+#: addons/addressbook/class_addressbook.inc:615
 msgid "global addressbook"
 msgstr "全局地址簿"
 
-#: addons/addressbook/class_addressbook.inc:613
+#: addons/addressbook/class_addressbook.inc:618
 msgid "user database"
 msgstr "用户数据库"
 
-#: addons/addressbook/class_addressbook.inc:617
+#: addons/addressbook/class_addressbook.inc:622
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "联系方式保存到 '%s'"
 
-#: addons/addressbook/class_addressbook.inc:619
+#: addons/addressbook/class_addressbook.inc:624
 msgid "Creating new entry in"
 msgstr "创建新条目到"
 
-#: addons/addressbook/class_addressbook.inc:658
+#: addons/addressbook/class_addressbook.inc:663
 msgid "All"
 msgstr "全部"
 
-#: addons/addressbook/class_addressbook.inc:658
-#: addons/addressbook/class_addressbook.inc:702
-#: addons/addressbook/class_addressbook.inc:711
-#: addons/addressbook/class_addressbook.inc:732
-#: addons/addressbook/class_addressbook.inc:863
+#: addons/addressbook/class_addressbook.inc:663
+#: addons/addressbook/class_addressbook.inc:707
+#: addons/addressbook/class_addressbook.inc:716
+#: addons/addressbook/class_addressbook.inc:737
+#: addons/addressbook/class_addressbook.inc:868
 msgid "Given name"
 msgstr "名"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Work phone"
 msgstr "工作电话"
 
-#: addons/addressbook/class_addressbook.inc:659
+#: addons/addressbook/class_addressbook.inc:664
 msgid "Cell phone"
 msgstr "移动电话"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "Home phone"
 msgstr "住宅电话"
 
-#: addons/addressbook/class_addressbook.inc:660
+#: addons/addressbook/class_addressbook.inc:665
 msgid "User ID"
 msgstr "用户 ID"
 
-#: addons/addressbook/class_addressbook.inc:719
+#: addons/addressbook/class_addressbook.inc:724
 #, fuzzy
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:722
+#: addons/addressbook/class_addressbook.inc:727
 #: addons/addressbook/contents.tpl:14
 msgid "Fax"
 msgstr "传真"
 
-#: addons/addressbook/class_addressbook.inc:748
+#: addons/addressbook/class_addressbook.inc:753
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr "无法为您的条目创建一个唯一 DN。请填写更多字段。"
 
-#: addons/addressbook/class_addressbook.inc:853
+#: addons/addressbook/class_addressbook.inc:858
 #, fuzzy
 msgid "Addressbook entries"
 msgstr "显示地址簿记录"
 
-#: addons/addressbook/class_addressbook.inc:854
+#: addons/addressbook/class_addressbook.inc:859
 #, fuzzy
 msgid "Addressbook related objects"
 msgstr "保存地址簿条目失败"
 
-#: addons/addressbook/class_addressbook.inc:858
+#: addons/addressbook/class_addressbook.inc:863
 msgid "Addons"
 msgstr "插件"
 
-#: addons/addressbook/class_addressbook.inc:862
-msgid "Surename"
+#: addons/addressbook/class_addressbook.inc:867
+msgid "Surname"
 msgstr "姓"
 
-#: addons/addressbook/class_addressbook.inc:864
+#: addons/addressbook/class_addressbook.inc:869
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:865
+#: addons/addressbook/class_addressbook.inc:870
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: addons/addressbook/class_addressbook.inc:866
+#: addons/addressbook/class_addressbook.inc:871
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:867
+#: addons/addressbook/class_addressbook.inc:872
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: addons/addressbook/class_addressbook.inc:868
+#: addons/addressbook/class_addressbook.inc:873
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: addons/addressbook/class_addressbook.inc:869
+#: addons/addressbook/class_addressbook.inc:874
 msgid "Mail address"
 msgstr "邮件地址"
 
-#: addons/addressbook/class_addressbook.inc:871
+#: addons/addressbook/class_addressbook.inc:876
 msgid "Organization"
 msgstr "组织/公司"
 
-#: addons/addressbook/class_addressbook.inc:873
+#: addons/addressbook/class_addressbook.inc:878
 msgid "Location"
 msgstr "位置"
 
-#: addons/addressbook/class_addressbook.inc:874
-#: addons/addressbook/class_addressbook.inc:875
+#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:880
 msgid "Postal address"
 msgstr "地址"
 
-#: addons/addressbook/class_addressbook.inc:876
+#: addons/addressbook/class_addressbook.inc:881
 msgid "State"
 msgstr "州/省"
 
-#: addons/addressbook/class_addressbook.inc:878
+#: addons/addressbook/class_addressbook.inc:883
 msgid "Title"
 msgstr "称谓"
 
-#: addons/addressbook/class_addressbook.inc:879
+#: addons/addressbook/class_addressbook.inc:884
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: addons/addressbook/class_addressbook.inc:880
+#: addons/addressbook/class_addressbook.inc:885
 msgid "Common name"
 msgstr "常用名"
 
@@ -439,6 +440,9 @@ msgstr "查询"
 msgid "Search string"
 msgstr "查找字符串"
 
+#~ msgid "Surename"
+#~ msgstr "姓"
+
 #~ msgid "You're about to delete the entry %s."
 #~ msgstr "您将要删除条目 %s。"
 
diff --git a/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po
index 1bbefe745..97dc4053f 100644
--- a/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2009-03-11 11:42+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po
index 27a344060..e2e91d4a3 100644
--- a/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2010-01-24 00:09+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po
index e1b58c0f2..f24f7ef07 100644
--- a/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/fr/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2009-06-30 10:43+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po
index f4293b6db..7cbb13675 100644
--- a/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/messages.po b/gosa-plugins/apache2/locale/messages.po
index 091b58351..87dbb69a3 100644
--- a/gosa-plugins/apache2/locale/messages.po
+++ b/gosa-plugins/apache2/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po
index f14473a65..cb28dbe6d 100644
--- a/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po
index b74df4971..7bf900743 100644
--- a/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po
index a18341b3d..8b735fa03 100644
--- a/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po
index f090ad133..5587e9c20 100644
--- a/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/apache2/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:33+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po
index e6c9b49fe..0f4cb110a 100644
--- a/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-04-02 14:20+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po
index eca2af1d3..c5ed956b0 100644
--- a/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2010-01-20 00:30+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po
index f0851d91e..2262feb1d 100644
--- a/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-06-04 09:19+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po
index 9b4e4d1a9..b9d65a9f1 100644
--- a/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/messages.po b/gosa-plugins/connectivity/locale/messages.po
index 147a83fb1..e5aa8fdd3 100644
--- a/gosa-plugins/connectivity/locale/messages.po
+++ b/gosa-plugins/connectivity/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po
index c0e7291b6..fb19e41e9 100644
--- a/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-06-09 17:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po
index 171e680f8..46a5ea103 100644
--- a/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2009-09-05 15:16+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po
index 8bb742107..f16762a3f 100644
--- a/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po
index 607416847..6a17eb7e1 100644
--- a/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/connectivity/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po
index e9bae821f..3867d7f73 100644
--- a/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-12-03 15:39+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po
index 1ed68d85d..38309cecc 100644
--- a/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2010-01-20 00:59+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po
index 6dad028ba..01e164c77 100644
--- a/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-07-23 22:13+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po
index 757753a72..50d702fae 100644
--- a/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/messages.po b/gosa-plugins/dak/locale/messages.po
index a347b2838..51492479e 100644
--- a/gosa-plugins/dak/locale/messages.po
+++ b/gosa-plugins/dak/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po
index 8b1ef02c1..aa4864e0a 100644
--- a/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po
index a17685ff5..502288083 100644
--- a/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po
index f27e5269e..44f206fd7 100644
--- a/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po
index 145c3b679..8790c9280 100644
--- a/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dak/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po
index ae899301a..5e29bc4f0 100644
--- a/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-04-03 14:16+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po
index 4ace36aca..029aaed6b 100644
--- a/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2010-01-24 23:59+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po
index 3cc8ac598..e814e2ae6 100644
--- a/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-06-04 09:22+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po
index ed9459875..7a6f71866 100644
--- a/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/messages.po b/gosa-plugins/dfs/locale/messages.po
index 12d7f3979..9ab32bcd5 100644
--- a/gosa-plugins/dfs/locale/messages.po
+++ b/gosa-plugins/dfs/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po
index 10657f8d4..c1a6a744f 100644
--- a/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-06-09 18:01+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po
index e63f4fe97..9d548dfe4 100644
--- a/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2009-09-05 15:17+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po
index 455c50027..7b0be5ea6 100644
--- a/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po
index 98a274454..ac83a5da4 100644
--- a/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dfs/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po
index fe7141271..2988aa687 100644
--- a/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-10-07 18:32+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,6 +37,7 @@ msgstr "Token Ring"
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -95,6 +97,53 @@ msgid "'Range' is not inside the configured network."
 msgstr ""
 "Der Bereich befindet sich nicht innerhalb des konfigurierten Netzwerks."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+msgid "Key name"
+msgstr "Schlüssel-Name"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr "Schlüssel"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr "DNS-Zone"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+msgid "DNS server"
+msgstr "DNS-Server"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr "Schlüssel-DN"
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 msgid "Lease time"
 msgstr "Lease-Gültigkeit"
@@ -116,7 +165,7 @@ msgid "Maximum lease time"
 msgstr "Maximale Lease-Gültigkeit"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -143,7 +192,7 @@ msgid "Min. lease time"
 msgstr "Min. Lease-Gültigkeit"
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Warnung"
 
@@ -302,10 +351,6 @@ msgstr "Domäne"
 msgid "Name of domain"
 msgstr "Name der Domäne"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-msgid "DNS server"
-msgstr "DNS-Server"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr "Liste der DNS-Server die verbreitet werden soll"
@@ -354,6 +399,10 @@ msgstr "Wählen Sie den zu erzeugenden Sektions-Typ"
 msgid "Create"
 msgstr "Erzeugen"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+msgid "DNS update zone"
+msgstr "DNS-Update-Zone"
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr "Bereich für dynamische Adresszuweisung"
@@ -424,9 +473,9 @@ msgid "Allow booting"
 msgstr "Erlaube Booten"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 msgid "DHCP service"
 msgstr "DHCP Dienst"
 
@@ -435,39 +484,39 @@ msgid "Logging"
 msgstr "Protokollierung"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Global options"
 msgstr "Globale Optionen"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr "Klasse"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 msgid "Subclass"
 msgstr "Subklasse"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 msgid "Host"
 msgstr "Host"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Gruppe"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 msgid "Pool"
 msgstr "Vorrat"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 msgid "Subnet"
 msgstr "Subnetz"
 
@@ -476,11 +525,22 @@ msgid "Failover peer"
 msgstr "Host für Ausfallsicherung"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 msgid "Shared network"
 msgstr "Verteiltes Netzwerk"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+msgid "DNS update key"
+msgstr "DNS-Update-Schlüssel"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+msgid "DNS update zones"
+msgstr "DNS-Update-Zonen"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
@@ -489,44 +549,44 @@ msgstr ""
 "Sie haben die Migration des DHCP-Setups von Server '%s' auf den aktuellen "
 "Server angefordert."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr "Die Migratione wird gestartet, wenn Sie dieses System speichern."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 msgid "DHCP section"
 msgstr "DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr "Füge neue DHCP-Sektion ein"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 msgid "Edit DHCP section"
 msgstr "Bearbeite DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 msgid "Remove DHCP section"
 msgstr "Entferne DHCP-Sektion"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -534,19 +594,19 @@ msgstr ""
 "Der DHCP-Konfigurationssatz ist unbekannt. Bitte benachrichtigen Sie Ihren "
 "System-Administrator."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 msgid "Start service"
 msgstr "Dienst starten"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 msgid "Stop service"
 msgstr "Dienst stoppen"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 msgid "Restart service"
 msgstr "Dienst neustarten"
 
@@ -560,6 +620,14 @@ msgstr "Kann automatische Anweisungen nicht entfernen!"
 msgid "automatic"
 msgstr "automatisch"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+msgid "Name of Key"
+msgstr "Name des Schlüssels"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr "Verschlüsselungsmethode"
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 msgid "Name of pool"
 msgstr "Name des Vorrats"
diff --git a/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po
index 9e86df351..f2cb0e85b 100644
--- a/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2010-01-24 00:19+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,6 +34,7 @@ msgstr "Token Ring"
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -91,6 +93,54 @@ msgstr "Rango de red"
 msgid "'Range' is not inside the configured network."
 msgstr "El rango no está dentro de la red configurada."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "Nombre del Rol"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+msgid "DNS server"
+msgstr "Servidor DNS"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 msgid "Lease time"
 msgstr "Tiempo de asignación"
@@ -112,7 +162,7 @@ msgid "Maximum lease time"
 msgstr "Tiempo de asignación máximo"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -139,7 +189,7 @@ msgid "Min. lease time"
 msgstr "Tiempo de asignación mínimo"
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Aviso"
 
@@ -299,10 +349,6 @@ msgstr "Dominio"
 msgid "Name of domain"
 msgstr "Nombre del dominio"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-msgid "DNS server"
-msgstr "Servidor DNS"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr "Lista de servidores DNS para la propagación"
@@ -351,6 +397,11 @@ msgstr "Seleccione el tipo de sección para crear"
 msgid "Create"
 msgstr "Crear"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+#, fuzzy
+msgid "DNS update zone"
+msgstr "Estilo de actualización DNS dinámica"
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr "Rango de asignación de direcciones dinámicas"
@@ -419,9 +470,9 @@ msgid "Allow booting"
 msgstr "Permitir inicialización"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 msgid "DHCP service"
 msgstr "Servicio DHCP"
 
@@ -430,39 +481,39 @@ msgid "Logging"
 msgstr "Registrando"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Global options"
 msgstr "Opciones globales"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr "Clase"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 msgid "Subclass"
 msgstr "Subclase"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 msgid "Host"
 msgstr "Nombre de equipo"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Grupo"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 msgid "Pool"
 msgstr "Conjunto(Pool)"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 msgid "Subnet"
 msgstr "Subred"
 
@@ -471,11 +522,24 @@ msgid "Failover peer"
 msgstr "Nodo de recuperación"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 msgid "Shared network"
 msgstr "Red compartida"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+#, fuzzy
+msgid "DNS update key"
+msgstr "Estilo de actualización DNS dinámica"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+#, fuzzy
+msgid "DNS update zones"
+msgstr "Estilo de actualización DNS dinámica"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
@@ -484,44 +548,44 @@ msgstr ""
 "A solicitado una migración de la configuración DHCP del servidor '%s' al "
 "actual."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr "La migración se iniciará cuando grabe este sistema."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 msgid "DHCP section"
 msgstr "Sección DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr "Insertar nueva sección DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 msgid "Edit DHCP section"
 msgstr "Editar sección DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 msgid "Remove DHCP section"
 msgstr "Eliminar sección DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -529,19 +593,19 @@ msgstr ""
 "La configuración DHCP es desconocida. Contacte con su administrador de "
 "sistemas."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 msgid "Start service"
 msgstr "Iniciar servicio"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 msgid "Stop service"
 msgstr "Parar servicio"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 msgid "Restart service"
 msgstr "Reiniciar servicio"
 
@@ -555,6 +619,15 @@ msgstr "¡No se puede eliminar informes automáticos!"
 msgid "automatic"
 msgstr "automático"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "Nombre de la máquina"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 msgid "Name of pool"
 msgstr "Nombre del Conjunto (Pool)"
diff --git a/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po
index b5ab99ff4..e1f19af59 100644
--- a/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2009-02-28 13:57+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,6 +30,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -87,6 +89,54 @@ msgstr "Etendue réseau"
 msgid "'Range' is not inside the configured network."
 msgstr "L'étendue réseau n'est pas comprise dans le réseau configuré."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "Prénom"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+msgid "DNS server"
+msgstr "Serveur DNS"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 msgid "Lease time"
 msgstr "Bail"
@@ -108,7 +158,7 @@ msgid "Maximum lease time"
 msgstr "Temps maximum du bail"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -135,7 +185,7 @@ msgid "Min. lease time"
 msgstr "Temps minimum du bail"
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -294,10 +344,6 @@ msgstr "Domaine"
 msgid "Name of domain"
 msgstr "Nom du domaine"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-msgid "DNS server"
-msgstr "Serveur DNS"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr "Liste des serveurs dns à propager"
@@ -346,6 +392,11 @@ msgstr "Choisissez le type de section à créer"
 msgid "Create"
 msgstr "Créer"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+#, fuzzy
+msgid "DNS update zone"
+msgstr "Style de mise à jour dynamique du DNS"
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr "Intervalle pour l'affectation d'adresses dynamique"
@@ -416,9 +467,9 @@ msgid "Allow booting"
 msgstr "Permettre le démarrage"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 msgid "DHCP service"
 msgstr "Service DHCP"
 
@@ -427,39 +478,39 @@ msgid "Logging"
 msgstr "Journaux systèmes"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Global options"
 msgstr "Options Globales"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr "Classe"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 msgid "Subclass"
 msgstr "sous classe"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 msgid "Host"
 msgstr "Hôte"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Groupes"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 msgid "Pool"
 msgstr "réservoir"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 msgid "Subnet"
 msgstr "Sous réseau"
 
@@ -468,11 +519,24 @@ msgid "Failover peer"
 msgstr "Partenaire pour la prise de contrôle"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 msgid "Shared network"
 msgstr "Réseaux partagés"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+#, fuzzy
+msgid "DNS update key"
+msgstr "Style de mise à jour dynamique du DNS"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+#, fuzzy
+msgid "DNS update zones"
+msgstr "Style de mise à jour dynamique du DNS"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
@@ -481,44 +545,44 @@ msgstr ""
 "Vous avez demandé la migration du serveur DHCP depuis le serveur '%s' vers "
 "le serveur actuel."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr "La migration sera démarrée lorsque vous sauverez ce système."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 msgid "DHCP section"
 msgstr "Section DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr "Insérer une nouvelle section DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 msgid "Edit DHCP section"
 msgstr "Editer une section DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 msgid "Remove DHCP section"
 msgstr "Suppression d'une section DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -526,19 +590,19 @@ msgstr ""
 "La configuration DHCP est inconnue. Veuillez contacter votre administrateur "
 "système."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 msgid "Start service"
 msgstr "Démarrer le service"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 msgid "Stop service"
 msgstr "Arrêter le service"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 msgid "Restart service"
 msgstr "Redémarrer le service"
 
@@ -552,6 +616,15 @@ msgstr "Impossible d'effacer les déclarations automatiques !"
 msgid "automatic"
 msgstr "automatique"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "Nom de l'hôte"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 msgid "Name of pool"
 msgstr "Nom du pool d'adresses"
diff --git a/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po
index 53897d048..a1647911e 100644
--- a/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,6 +32,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -94,6 +96,55 @@ msgstr "Mostra dispositiva di rete"
 msgid "'Range' is not inside the configured network."
 msgstr "Non hai il permesso di cambiare la tua password."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "Cognome"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+#, fuzzy
+msgid "DNS server"
+msgstr "Mostra dispositiva di rete"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 #, fuzzy
 msgid "Lease time"
@@ -119,7 +170,7 @@ msgid "Maximum lease time"
 msgstr "Inoltra i messaggi a"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -147,7 +198,7 @@ msgid "Min. lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -309,11 +360,6 @@ msgstr "Dominio"
 msgid "Name of domain"
 msgstr "Crea in"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-#, fuzzy
-msgid "DNS server"
-msgstr "Mostra dispositiva di rete"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr ""
@@ -366,6 +412,10 @@ msgstr ""
 msgid "Create"
 msgstr "Creare"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+msgid "DNS update zone"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr ""
@@ -440,9 +490,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 #, fuzzy
 msgid "DHCP service"
 msgstr "Dispositivi"
@@ -453,44 +503,44 @@ msgid "Logging"
 msgstr "Nome utente"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 #, fuzzy
 msgid "Global options"
 msgstr "Opzioni di posta"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 #, fuzzy
 msgid "Class"
 msgstr "classe"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 #, fuzzy
 msgid "Subclass"
 msgstr "classe"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 #, fuzzy
 msgid "Host"
 msgstr "spedire"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Gruppo"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 #, fuzzy
 msgid "Pool"
 msgstr "Inglese"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 #, fuzzy
 msgid "Subnet"
 msgstr "Imposta"
@@ -501,61 +551,72 @@ msgid "Failover peer"
 msgstr "Filtri"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 #, fuzzy
 msgid "Shared network"
 msgstr "Impostazioni Unix"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+msgid "DNS update key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, fuzzy, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 #, fuzzy
 msgid "DHCP section"
 msgstr "Ispezione della configurazione PHP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 #, fuzzy
 msgid "Edit DHCP section"
 msgstr "Ispezione della configurazione PHP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 #, fuzzy
 msgid "Remove DHCP section"
 msgstr "Elimina estensioni per le applicazioni"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
@@ -563,21 +624,21 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 #, fuzzy
 msgid "Start service"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 #, fuzzy
 msgid "Stop service"
 msgstr "Servizi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 #, fuzzy
 msgid "Restart service"
 msgstr "Servizi"
@@ -593,6 +654,15 @@ msgstr "Rimuovi"
 msgid "automatic"
 msgstr "automatico"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "Nome del gruppo"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 #, fuzzy
 msgid "Name of pool"
diff --git a/gosa-plugins/dhcp/locale/messages.po b/gosa-plugins/dhcp/locale/messages.po
index b8f59e1f0..21b7df9d5 100644
--- a/gosa-plugins/dhcp/locale/messages.po
+++ b/gosa-plugins/dhcp/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,6 +32,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -89,6 +91,53 @@ msgstr ""
 msgid "'Range' is not inside the configured network."
 msgstr ""
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+msgid "Key name"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+msgid "DNS server"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 msgid "Lease time"
 msgstr ""
@@ -110,7 +159,7 @@ msgid "Maximum lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -137,7 +186,7 @@ msgid "Min. lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr ""
 
@@ -283,10 +332,6 @@ msgstr ""
 msgid "Name of domain"
 msgstr ""
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-msgid "DNS server"
-msgstr ""
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr ""
@@ -335,6 +380,10 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+msgid "DNS update zone"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr ""
@@ -402,9 +451,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 msgid "DHCP service"
 msgstr ""
 
@@ -413,39 +462,39 @@ msgid "Logging"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Global options"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 msgid "Subclass"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 msgid "Host"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 msgid "Pool"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 msgid "Subnet"
 msgstr ""
 
@@ -454,73 +503,84 @@ msgid "Failover peer"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 msgid "Shared network"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+msgid "DNS update key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 msgid "DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 msgid "Edit DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 msgid "Remove DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 msgid "Start service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 msgid "Stop service"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 msgid "Restart service"
 msgstr ""
 
@@ -534,6 +594,14 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+msgid "Name of Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 msgid "Name of pool"
 msgstr ""
diff --git a/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po
index d2fe92566..de240de58 100644
--- a/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2008-06-09 18:26+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,6 +35,7 @@ msgstr "Token ring"
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -92,6 +94,54 @@ msgstr "Netwerkreeks"
 msgid "'Range' is not inside the configured network."
 msgstr "De reeks ligt niet binnen het geconfigureerde netwerk."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "Hernoemen"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+msgid "DNS server"
+msgstr "DNS server"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 msgid "Lease time"
 msgstr "Leasetijd"
@@ -113,7 +163,7 @@ msgid "Maximum lease time"
 msgstr "Maximale leasetijd"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -140,7 +190,7 @@ msgid "Min. lease time"
 msgstr "Minimale leasetijd"
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -297,10 +347,6 @@ msgstr "Domein"
 msgid "Name of domain"
 msgstr "Domeinnaam"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-msgid "DNS server"
-msgstr "DNS server"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr "Lijst met te propageren DNS servers"
@@ -349,6 +395,11 @@ msgstr "Selecteer het aan te maken sectie type"
 msgid "Create"
 msgstr "Aanmaken"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+#, fuzzy
+msgid "DNS update zone"
+msgstr "Dynamische DNS update stijl"
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr "Reeks voor dynamische adres toekenning"
@@ -416,9 +467,9 @@ msgid "Allow booting"
 msgstr "Opstarten toestaan"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 msgid "DHCP service"
 msgstr "DHCP service"
 
@@ -427,39 +478,39 @@ msgid "Logging"
 msgstr "Loggen"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 msgid "Global options"
 msgstr "Globale opties"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr "Klasse"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 msgid "Subclass"
 msgstr "Subklasse"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 msgid "Host"
 msgstr "Host"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Groep"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 msgid "Pool"
 msgstr "Pool"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 msgid "Subnet"
 msgstr "Subnet"
 
@@ -468,57 +519,70 @@ msgid "Failover peer"
 msgstr "Failover peer"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 msgid "Shared network"
 msgstr "Gedeeld netwerk"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+#, fuzzy
+msgid "DNS update key"
+msgstr "Dynamische DNS update stijl"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+#, fuzzy
+msgid "DNS update zones"
+msgstr "Dynamische DNS update stijl"
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
 msgstr ""
-"U heeft een aanvraag gedaan om de DHCP instellingen te migreren van server '%"
-"s' naar de huidige server."
+"U heeft een aanvraag gedaan om de DHCP instellingen te migreren van server "
+"'%s' naar de huidige server."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr "De migratie zal gestart worden, zodra u dit systeem bewaart."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 msgid "Permission error"
 msgstr "Permissiefout"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 msgid "DHCP section"
 msgstr "DHCP sectie"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr "Voer nieuwe DHCP sectie in"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 msgid "Edit DHCP section"
 msgstr "Bewerk DCHP sectie"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 msgid "Remove DHCP section"
 msgstr "Verwijder DHCP sectie"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 msgid "LDAP error"
 msgstr "LDAP fout"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
@@ -526,21 +590,21 @@ msgstr ""
 "De ingestelde DHCP configuratie is onbekend. Neem contact op met uw "
 "systeembeheerder."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 #, fuzzy
 msgid "Start service"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 #, fuzzy
 msgid "Stop service"
 msgstr "Services"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 #, fuzzy
 msgid "Restart service"
 msgstr "Volgende server"
@@ -555,6 +619,15 @@ msgstr "Kan automatische regels niet verwijderen!"
 msgid "automatic"
 msgstr "automatisch"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "Hostnaam"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 msgid "Name of pool"
 msgstr "Poolnaam"
diff --git a/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po
index 8483c8515..ab75d1587 100644
--- a/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -93,6 +95,55 @@ msgstr "Adres sieciowy"
 msgid "'Range' is not inside the configured network."
 msgstr "Zamierzasz skopiować wpis '%s'."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "Zmień nazwę"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+#, fuzzy
+msgid "DNS server"
+msgstr "Usługa DNS"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 #, fuzzy
 msgid "Lease time"
@@ -118,7 +169,7 @@ msgid "Maximum lease time"
 msgstr "Maksymalny rozmiar pliku"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -146,7 +197,7 @@ msgid "Min. lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -312,11 +363,6 @@ msgstr "Domena"
 msgid "Name of domain"
 msgstr "Nazwa departamentu"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-#, fuzzy
-msgid "DNS server"
-msgstr "Usługa DNS"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr ""
@@ -371,6 +417,10 @@ msgstr "Wybierz typ myszy"
 msgid "Create"
 msgstr "Utwórz"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+msgid "DNS update zone"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr ""
@@ -445,9 +495,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 #, fuzzy
 msgid "DHCP service"
 msgstr "Dodaj usługę DHCP"
@@ -458,43 +508,43 @@ msgid "Logging"
 msgstr "Login"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 #, fuzzy
 msgid "Global options"
 msgstr "Opcje poczty"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr "Klasa"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 #, fuzzy
 msgid "Subclass"
 msgstr "klasa"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 #, fuzzy
 msgid "Host"
 msgstr "wysyłanie"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Grupa"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 #, fuzzy
 msgid "Pool"
 msgstr "Bool"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 #, fuzzy
 msgid "Subnet"
 msgstr "Ustaw"
@@ -505,82 +555,93 @@ msgid "Failover peer"
 msgstr "Wzorce pliku"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 #, fuzzy
 msgid "Shared network"
 msgstr "Sieci Postfix"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+msgid "DNS update key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, fuzzy, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
 msgstr "Zamierzasz skopiować wpis '%s'."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 #, fuzzy
 msgid "DHCP section"
 msgstr "Inspekcja instalacji PHP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 #, fuzzy
 msgid "Edit DHCP section"
 msgstr "Inspekcja instalacji PHP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 #, fuzzy
 msgid "Remove DHCP section"
 msgstr "Wyłącz usługę DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "Konto zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Usługi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 #, fuzzy
 msgid "Start service"
 msgstr "Usługi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 #, fuzzy
 msgid "Stop service"
 msgstr "Usługi"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 #, fuzzy
 msgid "Restart service"
 msgstr "Serwer NTP"
@@ -596,6 +657,15 @@ msgstr "Nie można otworzyć pliku '%s'."
 msgid "automatic"
 msgstr "automatyczne"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "Nazwa bloklisty"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 #, fuzzy
 msgid "Name of pool"
diff --git a/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po
index c8c9d8eea..01f32ceb6 100644
--- a/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,6 +31,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -93,6 +95,55 @@ msgstr "Сетевые устройства"
 msgid "'Range' is not inside the configured network."
 msgstr "Вы собираетесь удалить объект %s."
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "Имя сервера"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+#, fuzzy
+msgid "DNS server"
+msgstr "Добавить сервис DNS"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 #, fuzzy
 msgid "Lease time"
@@ -118,7 +169,7 @@ msgid "Maximum lease time"
 msgstr "Размер квоты"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -146,7 +197,7 @@ msgid "Min. lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -316,11 +367,6 @@ msgstr "Домен"
 msgid "Name of domain"
 msgstr "Подразделение"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-#, fuzzy
-msgid "DNS server"
-msgstr "Добавить сервис DNS"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr ""
@@ -374,6 +420,10 @@ msgstr "Выберите тип мыши"
 msgid "Create"
 msgstr "Создать"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+msgid "DNS update zone"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr ""
@@ -450,9 +500,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 #, fuzzy
 msgid "DHCP service"
 msgstr "Добавить сервис DHCP"
@@ -463,44 +513,44 @@ msgid "Logging"
 msgstr "Имя пользователя"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 #, fuzzy
 msgid "Global options"
 msgstr "Почтовые настройки"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 #, fuzzy
 msgid "Class"
 msgstr "Выберите тип мыши"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 #, fuzzy
 msgid "Subclass"
 msgstr "Экспорт успешен."
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 #, fuzzy
 msgid "Host"
 msgstr "отправка"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "Группа"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 #, fuzzy
 msgid "Pool"
 msgstr "Английский"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 #, fuzzy
 msgid "Subnet"
 msgstr "Установить"
@@ -511,61 +561,72 @@ msgid "Failover peer"
 msgstr "Фильтры"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 #, fuzzy
 msgid "Shared network"
 msgstr "Атрибуты UNIX"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+msgid "DNS update key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, fuzzy, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
 msgstr "Вы собираетесь удалить объект %s."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 #, fuzzy
 msgid "DHCP section"
 msgstr "Проверка конфигурации PHP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 #, fuzzy
 msgid "Edit DHCP section"
 msgstr "Проверка конфигурации PHP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 #, fuzzy
 msgid "Remove DHCP section"
 msgstr "Удалить сервис DHCP"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
@@ -574,21 +635,21 @@ msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "Сервисы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 #, fuzzy
 msgid "Start service"
 msgstr "Сервисы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 #, fuzzy
 msgid "Stop service"
 msgstr "Сервисы"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 #, fuzzy
 msgid "Restart service"
 msgstr "Сервер NTP"
@@ -604,6 +665,15 @@ msgstr "Удалить"
 msgid "automatic"
 msgstr "автоматически"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "Имя стоп-листа"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 #, fuzzy
 msgid "Name of pool"
diff --git a/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po
index f24ebab64..6b538a73c 100644
--- a/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dhcp/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:36+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,6 +33,7 @@ msgstr ""
 #: admin/systems/services/dhcp/class_dhcpHost.inc:129
 #: admin/systems/services/dhcp/class_dhcpHost.inc:137
 #: admin/systems/services/dhcp/class_dhcpSubnet.inc:147
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:164
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:150
 #: admin/systems/services/dhcp/class_dhcpSharedNetwork.inc:168
@@ -94,6 +96,55 @@ msgstr "网络地址"
 msgid "'Range' is not inside the configured network."
 msgstr ""
 
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "HMAC-MD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSAMD5"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "RSASHA1"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DSA"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:48
+msgid "DH"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:111
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:124
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:6
+#, fuzzy
+msgid "Key name"
+msgstr "重命名"
+
+#: admin/systems/services/dhcp/class_dhcpTSigKey.inc:115
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:21
+msgid "Key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:147
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:6
+msgid "DNS zone"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:151
+#: admin/systems/services/dhcp/dhcp_network.tpl:73
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:13
+#, fuzzy
+msgid "DNS server"
+msgstr "添加 DNS 服务"
+
+#: admin/systems/services/dhcp/class_dhcpDnsZone.inc:155
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:21
+msgid "Key DN"
+msgstr ""
+
 #: admin/systems/services/dhcp/class_dhcpService.inc:126
 #, fuzzy
 msgid "Lease time"
@@ -119,7 +170,7 @@ msgid "Maximum lease time"
 msgstr "最大文件大小"
 
 #: admin/systems/services/dhcp/class_dhcpNetwork.inc:45
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:57
 #: admin/systems/services/dhcp/class_dhcpAdvanced.inc:71
 msgid "Error"
@@ -147,7 +198,7 @@ msgid "Min. lease time"
 msgstr ""
 
 #: admin/systems/services/dhcp/remove_dhcp.tpl:2
-#: admin/systems/services/dhcp/class_servDHCP.inc:111
+#: admin/systems/services/dhcp/class_servDHCP.inc:113
 msgid "Warning"
 msgstr "警告"
 
@@ -313,11 +364,6 @@ msgstr "域"
 msgid "Name of domain"
 msgstr "部门名称"
 
-#: admin/systems/services/dhcp/dhcp_network.tpl:73
-#, fuzzy
-msgid "DNS server"
-msgstr "添加 DNS 服务"
-
 #: admin/systems/services/dhcp/dhcp_network.tpl:75
 msgid "List of DNS servers to be propagated"
 msgstr ""
@@ -371,6 +417,10 @@ msgstr "选择鼠标类型"
 msgid "Create"
 msgstr "创建"
 
+#: admin/systems/services/dhcp/dhcp_dnszone.tpl:2
+msgid "DNS update zone"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_subnet.tpl:32
 msgid "Range for dynamic address assignment"
 msgstr ""
@@ -446,9 +496,9 @@ msgid "Allow booting"
 msgstr ""
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:36
-#: admin/systems/services/dhcp/class_servDHCP.inc:719
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
-#: admin/systems/services/dhcp/class_servDHCP.inc:766
+#: admin/systems/services/dhcp/class_servDHCP.inc:722
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
+#: admin/systems/services/dhcp/class_servDHCP.inc:769
 #, fuzzy
 msgid "DHCP service"
 msgstr "添加 DHCP 服务"
@@ -459,43 +509,43 @@ msgid "Logging"
 msgstr "登录名"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:39
-#: admin/systems/services/dhcp/class_servDHCP.inc:309
-#: admin/systems/services/dhcp/class_servDHCP.inc:628
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:26
+#: admin/systems/services/dhcp/class_servDHCP.inc:312
+#: admin/systems/services/dhcp/class_servDHCP.inc:631
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
 #, fuzzy
 msgid "Global options"
 msgstr "邮件选项"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:40
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:27
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
 msgid "Class"
 msgstr "ç±»"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:41
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:28
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
 #, fuzzy
 msgid "Subclass"
 msgstr "ç±»"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:42
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:29
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
 #, fuzzy
 msgid "Host"
 msgstr "è´´"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:43
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:30
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
 msgid "Group"
 msgstr "组"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:44
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:31
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
 #, fuzzy
 msgid "Pool"
 msgstr "布尔值"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:45
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:32
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
 #, fuzzy
 msgid "Subnet"
 msgstr "提交"
@@ -506,82 +556,93 @@ msgid "Failover peer"
 msgstr "过滤器"
 
 #: admin/systems/services/dhcp/class_servDHCP.inc:47
-#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:33
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:34
 #, fuzzy
 msgid "Shared network"
 msgstr "SMTP 授权网络"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:106
+#: admin/systems/services/dhcp/class_servDHCP.inc:48
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:35
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:2
+msgid "DNS update key"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:49
+#: admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc:36
+msgid "DNS update zones"
+msgstr ""
+
+#: admin/systems/services/dhcp/class_servDHCP.inc:108
 #, fuzzy, php-format
 msgid ""
 "You have requested a migration of the DHCP setup from server '%s' to the "
 "current one."
 msgstr "您将要拷贝条目 '%s'。"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:108
+#: admin/systems/services/dhcp/class_servDHCP.inc:110
 msgid "The migration will be started when you save this system."
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:225
+#: admin/systems/services/dhcp/class_servDHCP.inc:228
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:262
+#: admin/systems/services/dhcp/class_servDHCP.inc:265
 #, fuzzy
 msgid "DHCP section"
 msgstr "PHP 安装检查"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:333
 #: admin/systems/services/dhcp/class_servDHCP.inc:336
+#: admin/systems/services/dhcp/class_servDHCP.inc:339
 msgid "Insert new DHCP section"
 msgstr ""
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:334
 #: admin/systems/services/dhcp/class_servDHCP.inc:337
-#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:340
+#: admin/systems/services/dhcp/class_servDHCP.inc:341
 #, fuzzy
 msgid "Edit DHCP section"
 msgstr "PHP 安装检查"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:335
-#: admin/systems/services/dhcp/class_servDHCP.inc:339
+#: admin/systems/services/dhcp/class_servDHCP.inc:338
+#: admin/systems/services/dhcp/class_servDHCP.inc:342
 #, fuzzy
 msgid "Remove DHCP section"
 msgstr "删除 DHCP 服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:402
-#: admin/systems/services/dhcp/class_servDHCP.inc:419
-#: admin/systems/services/dhcp/class_servDHCP.inc:474
-#: admin/systems/services/dhcp/class_servDHCP.inc:550
-#: admin/systems/services/dhcp/class_servDHCP.inc:558
-#: admin/systems/services/dhcp/class_servDHCP.inc:585
+#: admin/systems/services/dhcp/class_servDHCP.inc:405
+#: admin/systems/services/dhcp/class_servDHCP.inc:422
+#: admin/systems/services/dhcp/class_servDHCP.inc:477
+#: admin/systems/services/dhcp/class_servDHCP.inc:553
+#: admin/systems/services/dhcp/class_servDHCP.inc:561
+#: admin/systems/services/dhcp/class_servDHCP.inc:588
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:708
+#: admin/systems/services/dhcp/class_servDHCP.inc:711
 #, fuzzy
 msgid ""
 "The DHCP configuration set is unkown. Please contact your system "
 "administrator."
 msgstr "账户锁定。请联系管理员。"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:720
+#: admin/systems/services/dhcp/class_servDHCP.inc:723
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:728
+#: admin/systems/services/dhcp/class_servDHCP.inc:731
 #, fuzzy
 msgid "Start service"
 msgstr "服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:729
+#: admin/systems/services/dhcp/class_servDHCP.inc:732
 #, fuzzy
 msgid "Stop service"
 msgstr "服务"
 
-#: admin/systems/services/dhcp/class_servDHCP.inc:730
+#: admin/systems/services/dhcp/class_servDHCP.inc:733
 #, fuzzy
 msgid "Restart service"
 msgstr "NTP 服务器"
@@ -597,6 +658,15 @@ msgstr "无法打开文件 '%s'。"
 msgid "automatic"
 msgstr "自动"
 
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:9
+#, fuzzy
+msgid "Name of Key"
+msgstr "黑名单名称"
+
+#: admin/systems/services/dhcp/dhcp_tsigkey.tpl:13
+msgid "Encryption method"
+msgstr ""
+
 #: admin/systems/services/dhcp/dhcp_pool.tpl:9
 #, fuzzy
 msgid "Name of pool"
diff --git a/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po
index 616e10a10..2dc6a44d6 100644
--- a/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-10-07 18:29+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,7 @@ msgstr "Übernahme"
 msgid "Zones"
 msgstr "Zonen"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -60,74 +61,74 @@ msgstr "Zonen"
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr "Auf"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Warnung"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
-msgstr "Ab"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "MxRecord"
+msgstr "MX-Eintrag"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Entfernen"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zonenname"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Reverse Zone"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr "Nur Kleinbuchstaben sind erlaubt."
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Serial"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 msgid "Time to life"
 msgstr "Lebensdauer"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Ablauf"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr "Netzwerk-Adresse"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
@@ -135,12 +136,12 @@ msgstr ""
 "Die angegebene Netzwerkaddresse und die Netzwerkklasse (%s/%s) passen nicht "
 "zueinander!"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Netzwerk-Klasse"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Hinzufügen"
@@ -425,6 +426,12 @@ msgstr "MX-Datensätze"
 msgid "Global zone records"
 msgstr "Globale Zonen-Datensätze"
 
+#~ msgid "Up"
+#~ msgstr "Auf"
+
+#~ msgid "Down"
+#~ msgstr "Ab"
+
 #~ msgid "Remove DNS service"
 #~ msgstr "DNS-Dienst entfernen"
 
diff --git a/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po
index 7cc2c647e..08eb2c0b3 100644
--- a/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 23:27+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +47,7 @@ msgstr "Gestionar"
 msgid "Zones"
 msgstr "Zonas"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -56,86 +57,87 @@ msgstr "Zonas"
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr "Arriba"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Aviso"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
-msgstr "Abajo"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+#, fuzzy
+msgid "MxRecord"
+msgstr "Registros MX"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nombre de la zona"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Zona Inversa"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr "Solo se permiten minúsculas"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Serie"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Refresco"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 msgid "Time to life"
 msgstr "Duración"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Expiración"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Reintento"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr "Dirección de red"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 "¡La dirección de red indicada y la mascara de red (%s/%s) no corresponden!"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Mascara de Red"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Añadir"
@@ -413,6 +415,12 @@ msgstr "Registros MX"
 msgid "Global zone records"
 msgstr "Registros de zona global"
 
+#~ msgid "Up"
+#~ msgstr "Arriba"
+
+#~ msgid "Down"
+#~ msgstr "Abajo"
+
 #~ msgid "Remove DNS service"
 #~ msgstr "Eliminar servicio DNS"
 
diff --git a/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po
index 1b913ddba..b59130b27 100644
--- a/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-30 11:40+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgstr "Prise de contrôle"
 msgid "Zones"
 msgstr "Zones"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -52,84 +53,87 @@ msgstr "Zones"
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr "Au dessus"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Avertissement"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
-msgstr "En bas"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+#, fuzzy
+msgid "MxRecord"
+msgstr "Enregistrements mx"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Supprimer"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nom de la zone"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Zone inverse"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr "Seule les minuscules sont autorisées."
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Série"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 msgid "Time to life"
 msgstr "Temps de vie"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Expirer"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Réessayer"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr "Adresse réseau"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
-msgid "The specified network address and the network class (%s/%s) do not match!"
-msgstr "L'adresse réseau spécifiée et la classe réseau (%s/%s) ne concordent pas !"
+msgid ""
+"The specified network address and the network class (%s/%s) do not match!"
+msgstr ""
+"L'adresse réseau spécifiée et la classe réseau (%s/%s) ne concordent pas !"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Classe réseau"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Ajouter"
@@ -169,7 +173,8 @@ msgstr "Service DNS"
 #: admin/systems/services/dns/class_servDNS.inc:151
 #, php-format
 msgid "You are going to migrate the DNS setup from server '%s'."
-msgstr "Vous êtes sur le point de migrer le serveur DNS depuis le serveur '%s'."
+msgstr ""
+"Vous êtes sur le point de migrer le serveur DNS depuis le serveur '%s'."
 
 #: admin/systems/services/dns/class_servDNS.inc:152
 msgid ""
@@ -192,7 +197,8 @@ msgstr "Classe"
 #: admin/systems/services/dns/class_servDNS.inc:335
 #, php-format
 msgid "Cannot delete the selected zone. It is still in use by '%s'"
-msgstr "Vous ne pouvez pas effacer cette zone car elle est encore utilisée par '%s'"
+msgstr ""
+"Vous ne pouvez pas effacer cette zone car elle est encore utilisée par '%s'"
 
 #: admin/systems/services/dns/class_servDNS.inc:445
 #: admin/systems/services/dns/class_servDNS.inc:461
@@ -273,12 +279,14 @@ msgstr "Les enregistrements '%s' ne peuvent pas être utilisés plus d'une fois.
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:309
 #, php-format
 msgid "Please fix the empty %s record for entry '%s'."
-msgstr "Veuillez corriger l'enregistrement vide '%s' pour l'enregistrement '%s'."
+msgstr ""
+"Veuillez corriger l'enregistrement vide '%s' pour l'enregistrement '%s'."
 
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:317
 #, php-format
 msgid "Please fix the duplicate %s record for entry '%s'."
-msgstr "Veuillez corriger l'enregistrement double '%s' pour l'enregistrement '%s'."
+msgstr ""
+"Veuillez corriger l'enregistrement double '%s' pour l'enregistrement '%s'."
 
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:457
 msgid "Remove"
@@ -377,7 +385,8 @@ msgstr "Masque réseau"
 
 #: admin/systems/services/dns/servdnseditzone.tpl:38
 msgid "Zone is in use, network settings can't be modified."
-msgstr "La zone est utilisée, les paramètres réseau ne peuvent pas être modifiés."
+msgstr ""
+"La zone est utilisée, les paramètres réseau ne peuvent pas être modifiés."
 
 #: admin/systems/services/dns/servdnseditzone.tpl:51
 msgid "Can't be edited because the zone wasn't saved right now."
@@ -407,3 +416,8 @@ msgstr "Enregistrements mx"
 msgid "Global zone records"
 msgstr "Enregistrements pour la zone globale"
 
+#~ msgid "Up"
+#~ msgstr "Au dessus"
+
+#~ msgid "Down"
+#~ msgstr "En bas"
diff --git a/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po
index 054f6d0ae..e35266a00 100644
--- a/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgstr "Server"
 msgid "Zones"
 msgstr "telefoni"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -54,94 +55,94 @@ msgstr "telefoni"
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr ""
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Attenzione"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
 #, fuzzy
-msgid "Down"
-msgstr "Dominio"
+msgid "MxRecord"
+msgstr "Directory"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Rimuovi"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 #, fuzzy
 msgid "Zone name"
 msgstr "Nome comune"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Riferimenti"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 #, fuzzy
 msgid "Serial"
 msgstr "Terminali"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 #, fuzzy
 msgid "Refresh"
 msgstr "Riferimenti"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 #, fuzzy
 msgid "Time to life"
 msgstr "Cellulare"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 #, fuzzy
 msgid "Expire"
 msgstr "Esporta"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Riprova"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 #, fuzzy
 msgid "Network address"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Aggiungi"
@@ -422,6 +423,10 @@ msgstr "Directory"
 msgid "Global zone records"
 msgstr "Directory"
 
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Dominio"
+
 #, fuzzy
 #~ msgid "Remove DNS service"
 #~ msgstr "Elimina foto"
diff --git a/gosa-plugins/dns/locale/messages.po b/gosa-plugins/dns/locale/messages.po
index e2597e100..da88df54e 100644
--- a/gosa-plugins/dns/locale/messages.po
+++ b/gosa-plugins/dns/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgstr ""
 msgid "Zones"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -52,85 +53,85 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "MxRecord"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 msgid "Time to life"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr ""
diff --git a/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po
index c32582ea9..17da9b01f 100644
--- a/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,7 +52,7 @@ msgstr "Tijd Service"
 msgid "Zones"
 msgstr "Zones"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -61,88 +62,89 @@ msgstr "Zones"
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr "Omhoog"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Waarschuwing"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
-msgstr "Omlaag"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+#, fuzzy
+msgid "MxRecord"
+msgstr "MX records"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Zone-naam"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Reverse zone"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 #, fuzzy
 msgid "Only lowercase allowed"
 msgstr "Hoofdletter zijn niet toegestaan voor de zone-naam."
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Serieel"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Ververs"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 #, fuzzy
 msgid "Time to life"
 msgstr "Tijdzone"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Vervaltijd"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr "Netwerkadres"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "Netwerkadres"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Toevoegen"
@@ -428,6 +430,12 @@ msgstr "MX records"
 msgid "Global zone records"
 msgstr "Globale zone records"
 
+#~ msgid "Up"
+#~ msgstr "Omhoog"
+
+#~ msgid "Down"
+#~ msgstr "Omlaag"
+
 #~ msgid "Remove DNS service"
 #~ msgstr "Verwijder DNS service"
 
diff --git a/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po
index 28fa1556c..7c7dade0a 100644
--- a/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-09-05 15:27+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgstr "Przejęcie"
 msgid "Zones"
 msgstr "Strefy"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -52,85 +53,86 @@ msgstr "Strefy"
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr "Góra"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Ostrzeżenie"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
-msgstr "W dół"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+#, fuzzy
+msgid "MxRecord"
+msgstr "Rekordy MX"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Usuń"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nazwa strefy"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "Strefa odwrotna"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr "Tylko małe liter są dozwolone"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "Szeregowy"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 msgid "Time to life"
 msgstr "Czas życia"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "Wygasa"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Ponawia"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr "Adres sieciowy"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr "Podany adres sieciowe i klasa sieciowa (%s/%s) nie zgadzają się!"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 msgid "Network class"
 msgstr "Klasa sieciowa"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Dodaj"
@@ -406,6 +408,12 @@ msgstr "Rekordy MX"
 msgid "Global zone records"
 msgstr "Globalne rekordy strefy"
 
+#~ msgid "Up"
+#~ msgstr "Góra"
+
+#~ msgid "Down"
+#~ msgstr "W dół"
+
 #~ msgid "Remove DNS service"
 #~ msgstr "Usuń usługę DNS"
 
diff --git a/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po
index c5a235d8e..dbf347268 100644
--- a/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +48,7 @@ msgstr "Сервисы"
 msgid "Zones"
 msgstr "телефоны"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -57,94 +58,94 @@ msgstr "телефоны"
 msgid "Error"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr ""
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "Предупреждение"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
 #, fuzzy
-msgid "Down"
-msgstr "Домен"
+msgid "MxRecord"
+msgstr "Каталог"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "Удалить"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 #, fuzzy
 msgid "Zone name"
 msgstr "Название"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 #, fuzzy
 msgid "Reverse zone"
 msgstr "Ссылки"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 msgid "Only lowercase allowed"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 #, fuzzy
 msgid "Serial"
 msgstr "терминалы"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 #, fuzzy
 msgid "Refresh"
 msgstr "Ссылки"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 #, fuzzy
 msgid "Time to life"
 msgstr "Мобильный"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 #, fuzzy
 msgid "Expire"
 msgstr "Экспорт"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "Повторить"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 #, fuzzy
 msgid "Network address"
 msgstr "Сетевые устройства"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "Сетевые устройства"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "Добавить"
@@ -427,6 +428,10 @@ msgstr "Каталог"
 msgid "Global zone records"
 msgstr "Каталог"
 
+#, fuzzy
+#~ msgid "Down"
+#~ msgstr "Домен"
+
 #~ msgid "Remove DNS service"
 #~ msgstr "Удалить сервис DNS"
 
diff --git a/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po
index a0d24df3b..f3b6195ae 100644
--- a/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/dns/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +48,7 @@ msgstr "主服务器"
 msgid "Zones"
 msgstr "域"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:249
+#: admin/systems/services/dns/class_servDNSeditZone.inc:184
 #: admin/systems/services/dns/class_servDNS.inc:174
 #: admin/systems/services/dns/class_servDNS.inc:335
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:220
@@ -57,88 +58,89 @@ msgstr "域"
 msgid "Error"
 msgstr "错误"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:347
-msgid "Up"
-msgstr "上"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+msgid "Warning"
+msgstr "警告"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:348
-msgid "Down"
-msgstr "关闭"
+#: admin/systems/services/dns/class_servDNSeditZone.inc:238
+#, fuzzy
+msgid "MxRecord"
+msgstr "Mx记录"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:350
-#: admin/systems/services/dns/class_servDNSeditZone.inc:588
+#: admin/systems/services/dns/class_servDNSeditZone.inc:270
+#: admin/systems/services/dns/class_servDNSeditZone.inc:505
 msgid "Delete"
 msgstr "删除"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:412
-#: admin/systems/services/dns/class_servDNSeditZone.inc:417
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
+#: admin/systems/services/dns/class_servDNSeditZone.inc:331
+#: admin/systems/services/dns/class_servDNSeditZone.inc:336
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
 #: admin/systems/services/dns/class_servDNS.inc:582
 #: admin/systems/services/dns/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "域名称"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:421
+#: admin/systems/services/dns/class_servDNSeditZone.inc:340
 #: admin/systems/services/dns/class_servDNS.inc:269
 #: admin/systems/services/dns/class_servDNS.inc:583
 msgid "Reverse zone"
 msgstr "反向解析域"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:425
-#: admin/systems/services/dns/class_servDNSeditZone.inc:451
+#: admin/systems/services/dns/class_servDNSeditZone.inc:344
+#: admin/systems/services/dns/class_servDNSeditZone.inc:370
 #, fuzzy
 msgid "Only lowercase allowed"
 msgstr "只有小写字符串被允许作为域名。"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:429
+#: admin/systems/services/dns/class_servDNSeditZone.inc:348
 #: admin/systems/services/dns/class_servDNS.inc:588
 msgid "Serial"
 msgstr "串行"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:433
+#: admin/systems/services/dns/class_servDNSeditZone.inc:352
 #: admin/systems/services/dns/class_servDNS.inc:589
 #: admin/systems/services/dns/servdnseditzone.tpl:102
 msgid "Refresh"
 msgstr "刷新"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:437
+#: admin/systems/services/dns/class_servDNSeditZone.inc:356
 #, fuzzy
 msgid "Time to life"
 msgstr "用户时区"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:441
+#: admin/systems/services/dns/class_servDNSeditZone.inc:360
 #: admin/systems/services/dns/class_servDNS.inc:591
 #: admin/systems/services/dns/servdnseditzone.tpl:120
 msgid "Expire"
 msgstr "过期"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:445
+#: admin/systems/services/dns/class_servDNSeditZone.inc:364
 #: admin/systems/services/dns/class_servDNS.inc:590
 #: admin/systems/services/dns/servdnseditzone.tpl:111
 msgid "Retry"
 msgstr "重试"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:460
-#: admin/systems/services/dns/class_servDNSeditZone.inc:474
+#: admin/systems/services/dns/class_servDNSeditZone.inc:379
+#: admin/systems/services/dns/class_servDNSeditZone.inc:393
 #: admin/systems/services/dns/servdnseditzone.tpl:16
 msgid "Network address"
 msgstr "网络地址"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:482
-#: admin/systems/services/dns/class_servDNSeditZone.inc:488
-#: admin/systems/services/dns/class_servDNSeditZone.inc:494
+#: admin/systems/services/dns/class_servDNSeditZone.inc:401
+#: admin/systems/services/dns/class_servDNSeditZone.inc:407
+#: admin/systems/services/dns/class_servDNSeditZone.inc:413
 #, php-format
 msgid ""
 "The specified network address and the network class (%s/%s) do not match!"
 msgstr ""
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:498
+#: admin/systems/services/dns/class_servDNSeditZone.inc:417
 #: admin/systems/services/dns/class_servDNS.inc:584
 #, fuzzy
 msgid "Network class"
 msgstr "网络地址"
 
-#: admin/systems/services/dns/class_servDNSeditZone.inc:594
+#: admin/systems/services/dns/class_servDNSeditZone.inc:511
 #: admin/systems/services/dns/class_servDNSeditZoneEntries.inc:455
 msgid "Add"
 msgstr "添加"
@@ -415,6 +417,12 @@ msgstr "Mx记录"
 msgid "Global zone records"
 msgstr "全局域记录"
 
+#~ msgid "Up"
+#~ msgstr "上"
+
+#~ msgid "Down"
+#~ msgstr "关闭"
+
 #~ msgid "Remove DNS service"
 #~ msgstr "删除 DNS 服务"
 
diff --git a/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
index 725fe9a29..cd0311290 100644
--- a/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-08-04 13:57+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -142,7 +143,7 @@ msgstr "sticky"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -152,9 +153,6 @@ msgstr "sticky"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -179,7 +177,7 @@ msgstr ""
 "Die Datei-Kodierung hat sich von '%s' nach '%s' geändert. Wollen Sie sie "
 "speichern?"
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Warnung"
@@ -214,19 +212,21 @@ msgstr "Gerät"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -237,11 +237,11 @@ msgstr "Gerät"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Name"
@@ -574,7 +574,6 @@ msgid "List of scripts"
 msgstr "Liste der Skripte"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -623,7 +622,7 @@ msgid "Please select the desired entries"
 msgstr "Bitte wählen Sie die gewünschten Einträge"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr "FAI"
@@ -659,7 +658,7 @@ msgid "Package bundle"
 msgstr "Paket-Gruppe"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -668,7 +667,6 @@ msgid "Partition table"
 msgstr "Partitionstabelle"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
@@ -706,7 +704,7 @@ msgstr "Ab"
 msgid "No class specified for this profile!"
 msgstr "Es wurde für dieses Profil keine Klasse definiert!"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 msgid "Profile"
@@ -733,7 +731,7 @@ msgid "Software deployment"
 msgstr "Software-Verteilung"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr "Software-Pakete und Installationsrichtlinien verwalten"
 
 #: admin/fai/class_faiManagement.inc:204
@@ -762,8 +760,8 @@ msgstr "Paketliste"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
@@ -791,86 +789,85 @@ msgstr ""
 msgid "FAI object"
 msgstr "FAI-Objekt"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr "FAI Teilbaum/Freeze"
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 msgid "You have no permission to delete this release!"
 msgstr "Sie haben keine Berechtigung, dieses Release zu löschen!"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 "Das Entfernen der Release ist aufgrund einer fehlgeschlagenen "
 "Namensüberprüfung fehlgeschlagen!"
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 msgid "Branch"
 msgstr "Teilbaum"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "Paketliste"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "Skripte"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Variablen"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "Hooks"
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr "OPSI Netboot Produkt"
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 msgid "OPSI localboot product"
 msgstr "OPSI Localboot-Produkt"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 msgid "FAI releases"
 msgstr "FAI Releases"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 msgid "FAI release management"
 msgstr "FAI Release-Verwaltung"
 
@@ -1277,7 +1274,6 @@ msgid "FAI partition table"
 msgstr "FAI-Partitionstabelle"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 msgid "Releases"
 msgstr "Releases"
@@ -1591,7 +1587,6 @@ msgid "Unknown FAI information source!"
 msgstr "Unbekannte FAI-Informationsquelle!"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr "Sie können diese Erweiterung erst verwenden, wenn FAI aktiviert wurde."
@@ -1661,16 +1656,22 @@ msgid "Service"
 msgstr "Dienste"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 msgid "Sections"
 msgstr "Sektionen"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+msgid "Parent server"
+msgstr "Quell-Server"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr "URL"
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1679,29 +1680,14 @@ msgstr "Sektionen"
 msgid "Repository service"
 msgstr "Repositorien-Dienst"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 msgid "FAI release"
 msgstr "FAI Release"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Dienste"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-msgid "Parent server"
-msgstr "Quell-Server"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr "URL"
-
 #~ msgid "List of available packages"
 #~ msgstr "Liste verfügbarer Pakete"
 
diff --git a/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
index ad98f42c1..08d4cea38 100644
--- a/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 23:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -137,7 +138,7 @@ msgstr "estatico"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -147,9 +148,6 @@ msgstr "estatico"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -173,7 +171,7 @@ msgstr ""
 "La codificación del archivo ha cambiado de '%s' a '%s'.¿Quiere realmente "
 "grabarlo?"
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Aviso"
@@ -209,19 +207,21 @@ msgstr "Dispositivo"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -232,11 +232,11 @@ msgstr "Dispositivo"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Nombre"
@@ -517,8 +517,8 @@ msgid ""
 "You cannot have more than three primary partition while using logical "
 "partitions, please check your configuration twice."
 msgstr ""
-"Tiene en la configuración mas de 3 entradas primarias usando "
-"particiones lógicas, por favor vuelva a comprobar la configuración."
+"Tiene en la configuración mas de 3 entradas primarias usando particiones "
+"lógicas, por favor vuelva a comprobar la configuración."
 
 #: admin/fai/class_faiDiskEntry.inc:740
 msgid "Disk options"
@@ -568,7 +568,6 @@ msgid "List of scripts"
 msgstr "Lista de scripts"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -617,7 +616,7 @@ msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr "FAI"
@@ -653,7 +652,7 @@ msgid "Package bundle"
 msgstr "Conjunto de paquetes"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -662,7 +661,6 @@ msgid "Partition table"
 msgstr "Tabla de particiones"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
@@ -700,7 +698,7 @@ msgstr "Abajo"
 msgid "No class specified for this profile!"
 msgstr "¡No se ha especificado una clase para este perfil!"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 msgid "Profile"
@@ -727,7 +725,8 @@ msgid "Software deployment"
 msgstr "Desarrollo de software"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+#, fuzzy
+msgid "Manage software packages and deployment recipes"
 msgstr "Gestionar paquetes de software y métodos de despliegue"
 
 #: admin/fai/class_faiManagement.inc:204
@@ -756,8 +755,8 @@ msgstr "lista de paquetes"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 msgid "Permission error"
 msgstr "Error de permisos"
 
@@ -783,86 +782,85 @@ msgstr "Las siguientes entradas están bloqueadas, no puede eliminar %s."
 msgid "FAI object"
 msgstr "Objeto FAI"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr "Rama congelada FAI"
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 msgid "You have no permission to delete this release!"
 msgstr "¡No tiene permisos para eliminar esta versión!"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 "¡La eliminación de la versión ha sido cancelada al fallar la comprobación "
 "del nombre de la versión!"
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 msgid "Configuration"
 msgstr "Configuración"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 msgid "Branch"
 msgstr "Rama"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Continuar"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 msgid "Service infrastructure"
 msgstr "Infraestructura de servicio"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 msgid "Fatal error"
 msgstr "Error fatal"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "Lista de paquetes"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "Scripts"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Variables"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "Métodos"
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Plantillas"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr "Producto de inicio en red OPSI"
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 msgid "OPSI localboot product"
 msgstr "Productos de inicio local OPSI"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 msgid "FAI releases"
 msgstr "Versiones FAI"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 msgid "FAI release management"
 msgstr "Administración de versiones FAI"
 
@@ -1272,7 +1270,6 @@ msgid "FAI partition table"
 msgstr "Tabla de particiones FAI"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 msgid "Releases"
 msgstr "Versiones"
@@ -1584,7 +1581,6 @@ msgid "Unknown FAI information source!"
 msgstr "¡Fuente de información FAI desconocida!"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr "No puede usar esta extensión hasta que FAI sea activado."
@@ -1654,16 +1650,22 @@ msgid "Service"
 msgstr "Servicio"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 msgid "Sections"
 msgstr "Secciones"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+msgid "Parent server"
+msgstr "Servidor Origen"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr "URL"
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1672,29 +1674,14 @@ msgstr "Secciones"
 msgid "Repository service"
 msgstr "Servicio de repositorio"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 msgid "FAI release"
 msgstr "Versión FAI"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Servicios"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-msgid "Parent server"
-msgstr "Servidor Origen"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr "URL"
-
 #~ msgid "List of available packages"
 #~ msgstr "Lista de paquetes disponibles"
 
diff --git a/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
index f6b91161f..b6c21f23b 100644
--- a/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 22:23+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +134,7 @@ msgstr "permanent"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -143,9 +144,6 @@ msgstr "permanent"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -164,12 +162,13 @@ msgstr ""
 
 #: admin/fai/class_faiTemplateEdit.inc:60
 #, php-format
-msgid "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
+msgid ""
+"The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 "L'encodage du fichier à changé de '%s' vers '%s', voulez vous réellement le "
 "sauver ?"
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Avertissement"
@@ -205,19 +204,21 @@ msgstr "Périphérique"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -228,11 +229,11 @@ msgstr "Périphérique"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Nom"
@@ -482,7 +483,8 @@ msgstr "Taille"
 #: admin/fai/class_faiDiskEntry.inc:428
 #: admin/fai/class_faiPartitionTable.inc:245
 #, php-format
-msgid "The disk cannot be deleted while it is used in the '%s' disk definition!"
+msgid ""
+"The disk cannot be deleted while it is used in the '%s' disk definition!"
 msgstr ""
 "Ce disque ne peut pas être supprimé car il est utilisé par la définition de "
 "disque '%s' !"
@@ -561,7 +563,6 @@ msgid "List of scripts"
 msgstr "Liste des scripts"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -610,7 +611,7 @@ msgid "Please select the desired entries"
 msgstr "Veuillez sélectionner les entrées désirées"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr "FAI"
@@ -646,7 +647,7 @@ msgid "Package bundle"
 msgstr "Ensemble des paquets"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -655,7 +656,6 @@ msgid "Partition table"
 msgstr "Table des partitions"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr ""
 
@@ -693,7 +693,7 @@ msgstr "En bas"
 msgid "No class specified for this profile!"
 msgstr "Pas de classe spécifiée pour ce profile !"
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 msgid "Profile"
@@ -720,7 +720,8 @@ msgid "Software deployment"
 msgstr "Déploiement de logiciels"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+#, fuzzy
+msgid "Manage software packages and deployment recipes"
 msgstr "Gestion des paquets logiciels et des recettes de déploiement"
 
 #: admin/fai/class_faiManagement.inc:204
@@ -749,8 +750,8 @@ msgstr "liste des paquets"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 msgid "Permission error"
 msgstr "Erreur de permission"
 
@@ -770,92 +771,92 @@ msgstr "Branche verrouillée"
 #: admin/fai/class_faiManagement.inc:393
 #, php-format
 msgid "The following entries are locked, you can't remove them %s."
-msgstr "Les entrées suivantes %s sont vérouillées, vous ne pouvez pas les effacer."
+msgstr ""
+"Les entrées suivantes %s sont vérouillées, vous ne pouvez pas les effacer."
 
 #: admin/fai/class_faiManagement.inc:411
 msgid "FAI object"
 msgstr "Objet FAI"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr "FAI branche/vérrouillée"
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 msgid "You have no permission to delete this release!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette version !"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 "Echec de l'effacement de la version, la vérification du nom de la version à "
 "échoué !"
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 msgid "Configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 msgid "Branch"
 msgstr "Branche"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Continuer"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 msgid "Service infrastructure"
 msgstr "Service d'infrastructure"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "Liste des paquets"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "Scripts"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Variables"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "Connexions"
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Modèles"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr "Produit netboot OPSI"
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 msgid "OPSI localboot product"
 msgstr "Produit localboot OPSI"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 msgid "FAI releases"
 msgstr "Versions FAI"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 msgid "FAI release management"
 msgstr "Gestion des versions FAI"
 
@@ -1057,7 +1058,8 @@ msgstr "Traitement en cours"
 
 #: admin/fai/class_FAI.inc:1084
 msgid "Could not create new release, the destination dn is already in use."
-msgstr "Impossible de créer une nouvelle version, le dn de destination existe déjà."
+msgstr ""
+"Impossible de créer une nouvelle version, le dn de destination existe déjà."
 
 #: admin/fai/class_FAI.inc:1097
 msgid "Error while fetching source dn - aborted!"
@@ -1065,7 +1067,8 @@ msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt !"
 
 #: admin/fai/class_FAI.inc:1179
 #, php-format
-msgid "Release creation failed due to ldap errors. Additional informations '%s'."
+msgid ""
+"Release creation failed due to ldap errors. Additional informations '%s'."
 msgstr ""
 "La création de la version à échoué du à des erreurs ldap. Information "
 "additionnelles '%s'."
@@ -1252,7 +1255,8 @@ msgid "Raid arrays must contain at least two partitions!"
 msgstr "Les ensembles RAID doit contenir au moins 2 partitions !"
 
 #: admin/fai/class_faiPartition.inc:406
-msgid "Raid 0 arrays can only be realized with a combination of two partitions!"
+msgid ""
+"Raid 0 arrays can only be realized with a combination of two partitions!"
 msgstr "Les ensembles RAID 0 ne peuvent être réalisé qu'avec deux partitions !"
 
 #: admin/fai/class_faiPartitionTable.inc:785
@@ -1260,7 +1264,6 @@ msgid "FAI partition table"
 msgstr "Table des partitions FAI"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 msgid "Releases"
 msgstr "Versions"
@@ -1508,7 +1511,8 @@ msgid "Please select a least one package!"
 msgstr "Veuillez sélectionner au moins un paquet !"
 
 #: admin/fai/class_faiPackage.inc:534
-msgid "Please choose a valid release/section combination for your repository setup!"
+msgid ""
+"Please choose a valid release/section combination for your repository setup!"
 msgstr ""
 "Veuillez choisir une combinaison valable version/section pour la création de "
 "votre dépôt de paquets !"
@@ -1571,10 +1575,10 @@ msgid "Unknown FAI information source!"
 msgstr "Source d'information FAI inconnue !"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
-msgstr "Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette extension tant que FAI n'est pas activé."
 
 #: admin/fai/class_faiSummaryTab.inc:225
 msgid "This object has no FAI classes assigned."
@@ -1641,16 +1645,22 @@ msgid "Service"
 msgstr "Services"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 msgid "Sections"
 msgstr "Sections"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+msgid "Parent server"
+msgstr "Serveur parent"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr "URL"
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1659,26 +1669,10 @@ msgstr "Sections"
 msgid "Repository service"
 msgstr "Service de dépôt"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 msgid "FAI release"
 msgstr "Version FAI"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Services"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-msgid "Parent server"
-msgstr "Serveur parent"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr "URL"
-
diff --git a/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
index c940d0d82..149421707 100644
--- a/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,7 +151,7 @@ msgstr "statico"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -160,9 +161,6 @@ msgstr "statico"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -183,7 +181,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Attenzione"
@@ -217,19 +215,21 @@ msgstr "Dispositivi"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -240,11 +240,11 @@ msgstr "Dispositivi"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Cognome"
@@ -601,7 +601,6 @@ msgid "List of scripts"
 msgstr "Lista degli utenti"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 #, fuzzy
@@ -658,7 +657,7 @@ msgid "Please select the desired entries"
 msgstr "Lingua preferita"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 #, fuzzy
 msgid "FAI"
@@ -699,7 +698,7 @@ msgid "Package bundle"
 msgstr "Pacchetti"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -709,7 +708,6 @@ msgid "Partition table"
 msgstr "Partizioni"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
@@ -749,7 +747,7 @@ msgstr "Dominio"
 msgid "No class specified for this profile!"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 #, fuzzy
@@ -780,7 +778,7 @@ msgid "Software deployment"
 msgstr "Dipartimento"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:204
@@ -815,8 +813,8 @@ msgstr "Liste di blocco"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
@@ -846,93 +844,92 @@ msgstr ""
 msgid "FAI object"
 msgstr "Gruppo di oggetti"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 #, fuzzy
 msgid "You have no permission to delete this release!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "Configuration"
 msgstr "File di configurazione"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Branch"
 msgstr "Annulla"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Continua"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Seleziona per mostrare le applicazioni"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal Server"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 #, fuzzy
 msgid "Package list"
 msgstr "Pacchetti"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 #, fuzzy
 msgid "Scripts"
 msgstr "Script path"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Variabili"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Template"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 #, fuzzy
 msgid "OPSI localboot product"
 msgstr "Gruppi di oggetti"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 #, fuzzy
 msgid "FAI releases"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 #, fuzzy
 msgid "FAI release management"
 msgstr "Riferimenti"
@@ -1365,7 +1362,6 @@ msgid "FAI partition table"
 msgstr "Stampante"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 #, fuzzy
 msgid "Releases"
@@ -1696,7 +1692,6 @@ msgid "Unknown FAI information source!"
 msgstr "Informazioni personali"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr ""
@@ -1771,17 +1766,24 @@ msgid "Service"
 msgstr "Servizi"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 #, fuzzy
 msgid "Sections"
 msgstr "Azione"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+#, fuzzy
+msgid "Parent server"
+msgstr "server"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr ""
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1791,31 +1793,15 @@ msgstr "Azione"
 msgid "Repository service"
 msgstr "Riprova"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 #, fuzzy
 msgid "FAI release"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Servizi"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-#, fuzzy
-msgid "Parent server"
-msgstr "server"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
-
 #, fuzzy
 #~ msgid "List of available packages"
 #~ msgstr "Scegli il tuo numero di telefono personale"
diff --git a/gosa-plugins/fai/locale/messages.po b/gosa-plugins/fai/locale/messages.po
index 3d983e591..62186bd36 100644
--- a/gosa-plugins/fai/locale/messages.po
+++ b/gosa-plugins/fai/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -135,7 +136,7 @@ msgstr ""
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -145,9 +146,6 @@ msgstr ""
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -168,7 +166,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr ""
@@ -198,19 +196,21 @@ msgstr ""
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -221,11 +221,11 @@ msgstr ""
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr ""
@@ -543,7 +543,6 @@ msgid "List of scripts"
 msgstr ""
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -592,7 +591,7 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr ""
@@ -628,7 +627,7 @@ msgid "Package bundle"
 msgstr ""
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -637,7 +636,6 @@ msgid "Partition table"
 msgstr ""
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr ""
 
@@ -675,7 +673,7 @@ msgstr ""
 msgid "No class specified for this profile!"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 msgid "Profile"
@@ -702,7 +700,7 @@ msgid "Software deployment"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:204
@@ -731,8 +729,8 @@ msgstr ""
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 msgid "Permission error"
 msgstr ""
 
@@ -758,84 +756,83 @@ msgstr ""
 msgid "FAI object"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 msgid "You have no permission to delete this release!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 msgid "Configuration"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 msgid "Branch"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 msgid "Service infrastructure"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 msgid "Fatal error"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 msgid "OPSI localboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 msgid "FAI releases"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 msgid "FAI release management"
 msgstr ""
 
@@ -1232,7 +1229,6 @@ msgid "FAI partition table"
 msgstr ""
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 msgid "Releases"
 msgstr ""
@@ -1521,7 +1517,6 @@ msgid "Unknown FAI information source!"
 msgstr ""
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr ""
@@ -1587,16 +1582,22 @@ msgid "Service"
 msgstr ""
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 msgid "Sections"
 msgstr ""
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+msgid "Parent server"
+msgstr ""
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr ""
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1605,25 +1606,10 @@ msgstr ""
 msgid "Repository service"
 msgstr ""
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 msgid "FAI release"
 msgstr ""
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr ""
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-msgid "Parent server"
-msgstr ""
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
diff --git a/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
index 17f411997..c5feefbab 100644
--- a/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -141,7 +142,7 @@ msgstr "sticky"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -151,9 +152,6 @@ msgstr "sticky"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -177,7 +175,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -212,19 +210,21 @@ msgstr "Apparaat"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -235,11 +235,11 @@ msgstr "Apparaat"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Naam"
@@ -590,7 +590,6 @@ msgid "List of scripts"
 msgstr "Lijst met scripts"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -642,7 +641,7 @@ msgid "Please select the desired entries"
 msgstr "Voorkeurstaal"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr "FAI"
@@ -678,7 +677,7 @@ msgid "Package bundle"
 msgstr "Pakket bundel"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -687,7 +686,6 @@ msgid "Partition table"
 msgstr "Partitietabel"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
@@ -725,7 +723,7 @@ msgstr "Omlaag"
 msgid "No class specified for this profile!"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 #, fuzzy
@@ -755,7 +753,7 @@ msgid "Software deployment"
 msgstr "Systeembeheer"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:204
@@ -790,8 +788,8 @@ msgstr "Pakketlijst"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
@@ -821,91 +819,90 @@ msgstr ""
 msgid "FAI object"
 msgstr "FAI objectlijst"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 #, fuzzy
 msgid "You have no permission to delete this release!"
 msgstr "U heeft geen toestemming om deze uitgave te verwijderen!"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuratie bestand"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Branch"
 msgstr "Aftakkingen"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Zoek binnen subtree"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal server"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "Pakketlijst"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "Scripts"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Variabelen"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 #, fuzzy
 msgid "OPSI localboot product"
 msgstr "Objectgroepen"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 #, fuzzy
 msgid "FAI releases"
 msgstr "FAI klassen"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 #, fuzzy
 msgid "FAI release management"
 msgstr "Blokkeerlijst beheer"
@@ -1333,7 +1330,6 @@ msgid "FAI partition table"
 msgstr "Nieuwe partitietabel"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 #, fuzzy
 msgid "Releases"
@@ -1674,7 +1670,6 @@ msgid "Unknown FAI information source!"
 msgstr "Persoonlijke informatie"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr ""
@@ -1743,17 +1738,24 @@ msgid "Service"
 msgstr "Services"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 #, fuzzy
 msgid "Sections"
 msgstr "Sectie"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+#, fuzzy
+msgid "Parent server"
+msgstr "Bewaar"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr ""
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1763,31 +1765,15 @@ msgstr "Sectie"
 msgid "Repository service"
 msgstr "Verzamelplaats"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 #, fuzzy
 msgid "FAI release"
 msgstr "FAI klassen"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Services"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-#, fuzzy
-msgid "Parent server"
-msgstr "Bewaar"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
-
 #~ msgid "List of available packages"
 #~ msgstr "Lijst met beschikbare pakketten"
 
diff --git a/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
index 08c559c55..ae39c74f5 100644
--- a/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -136,7 +137,7 @@ msgstr "sticky"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -146,9 +147,6 @@ msgstr "sticky"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -172,7 +170,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -207,19 +205,21 @@ msgstr "Urządzenie"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -230,11 +230,11 @@ msgstr "Urządzenie"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Imię"
@@ -358,8 +358,8 @@ msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
-"Typ systemu plików 'swap' jest już użyty. Zmień system plików dla partycji %"
-"s."
+"Typ systemu plików 'swap' jest już użyty. Zmień system plików dla partycji "
+"%s."
 
 #: admin/fai/class_faiPartitionTableEntry.inc:373
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
@@ -575,7 +575,6 @@ msgid "List of scripts"
 msgstr "Lista skryptów"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -627,7 +626,7 @@ msgid "Please select the desired entries"
 msgstr "Preferowany język"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr "FAI"
@@ -663,7 +662,7 @@ msgid "Package bundle"
 msgstr "Zestaw pakietu"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -672,7 +671,6 @@ msgid "Partition table"
 msgstr "Tablica partycji"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "Kontener"
 
@@ -710,7 +708,7 @@ msgstr "W dół"
 msgid "No class specified for this profile!"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 msgid "Profile"
@@ -738,7 +736,7 @@ msgid "Software deployment"
 msgstr "Zarządzanie systemem"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:204
@@ -773,8 +771,8 @@ msgstr "Lista pakietów"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
@@ -804,90 +802,89 @@ msgstr ""
 msgid "FAI object"
 msgstr "Drzewo obiektów FAI"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 #, fuzzy
 msgid "You have no permission to delete this release!"
 msgstr "Brak uprawnień do usunięcia tego wydania!"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Branch"
 msgstr "Gałęzie"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Kontynuuj"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal Server"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "Lista pakietów"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "Skrypty"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "Zmienie"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "Zaczepy"
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "Szablony"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 #, fuzzy
 msgid "OPSI localboot product"
 msgstr "Grupy obiektów"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 #, fuzzy
 msgid "FAI releases"
 msgstr "Klasy FAI"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 #, fuzzy
 msgid "FAI release management"
 msgstr "Zarządzanie FAI"
@@ -1312,7 +1309,6 @@ msgid "FAI partition table"
 msgstr "Tablica partycji FAI"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 #, fuzzy
 msgid "Releases"
@@ -1641,7 +1637,6 @@ msgid "Unknown FAI information source!"
 msgstr "Informacje osobiste"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr ""
@@ -1710,17 +1705,24 @@ msgid "Service"
 msgstr "Usługi"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 #, fuzzy
 msgid "Sections"
 msgstr "Sekcja"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+#, fuzzy
+msgid "Parent server"
+msgstr "Zachowaj"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr ""
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1730,31 +1732,15 @@ msgstr "Sekcja"
 msgid "Repository service"
 msgstr "Repozytorium"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 #, fuzzy
 msgid "FAI release"
 msgstr "Klasy FAI"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Usługi"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-#, fuzzy
-msgid "Parent server"
-msgstr "Zachowaj"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
-
 #~ msgid "List of available packages"
 #~ msgstr "Lista dostępnych pakietów"
 
diff --git a/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
index da80ae519..ce1158787 100644
--- a/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,7 +151,7 @@ msgstr "Состояние"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -160,9 +161,6 @@ msgstr "Состояние"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -183,7 +181,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "Предупреждение"
@@ -221,19 +219,21 @@ msgstr "Устройства"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -244,11 +244,11 @@ msgstr "Устройства"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "Фамилия"
@@ -606,7 +606,6 @@ msgid "List of scripts"
 msgstr "Список пользователей"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 #, fuzzy
@@ -663,7 +662,7 @@ msgid "Please select the desired entries"
 msgstr "Язык по умолчанию"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 #, fuzzy
 msgid "FAI"
@@ -704,7 +703,7 @@ msgid "Package bundle"
 msgstr "Показать телефоны"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -714,7 +713,6 @@ msgid "Partition table"
 msgstr "Переменная"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "Ветка"
 
@@ -754,7 +752,7 @@ msgstr "Домен"
 msgid "No class specified for this profile!"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 #, fuzzy
@@ -785,7 +783,7 @@ msgid "Software deployment"
 msgstr "Управление системами"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:204
@@ -820,8 +818,8 @@ msgstr "Число страниц"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
@@ -851,95 +849,94 @@ msgstr ""
 msgid "FAI object"
 msgstr "Имя объекта"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 #, fuzzy
 msgid "You have no permission to delete this release!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "Configuration"
 msgstr "Настроить"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Branch"
 msgstr "Отмена"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "Продолжить"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Искать в поддеревьях"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 #, fuzzy
 msgid "Fatal error"
 msgstr "Терминал-сервер"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 #, fuzzy
 msgid "Package list"
 msgstr "Показать телефоны"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 #, fuzzy
 msgid "Scripts"
 msgstr "Путь к сценариям"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 #, fuzzy
 msgid "Variables"
 msgstr "Переменная"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 #, fuzzy
 msgid "Templates"
 msgstr "Шаблон"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 #, fuzzy
 msgid "OPSI localboot product"
 msgstr "Объединения"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 #, fuzzy
 msgid "FAI releases"
 msgstr "Выберите тип мыши"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 #, fuzzy
 msgid "FAI release management"
 msgstr "Управление подразделениями"
@@ -1384,7 +1381,6 @@ msgid "FAI partition table"
 msgstr "Принтер"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 #, fuzzy
 msgid "Releases"
@@ -1719,7 +1715,6 @@ msgid "Unknown FAI information source!"
 msgstr "Личная информация"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr ""
@@ -1794,17 +1789,24 @@ msgid "Service"
 msgstr "Сервисы"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 #, fuzzy
 msgid "Sections"
 msgstr "Действие"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+#, fuzzy
+msgid "Parent server"
+msgstr "серверы"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr ""
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1814,31 +1816,15 @@ msgstr "Действие"
 msgid "Repository service"
 msgstr "Повторить"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 #, fuzzy
 msgid "FAI release"
 msgstr "Выберите тип мыши"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "Сервисы"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-#, fuzzy
-msgid "Parent server"
-msgstr "серверы"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
-
 #, fuzzy
 #~ msgid "List of available packages"
 #~ msgstr "Выберите тип мыши"
diff --git a/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
index 5ddbd85c0..3c42ddd39 100644
--- a/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/fai/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -138,7 +139,7 @@ msgstr "置顶"
 #: admin/fai/class_faiHook.inc:239 admin/fai/class_faiDiskEntry.inc:427
 #: admin/fai/tabsPartition.inc:34 admin/fai/class_filterFAI.inc:125
 #: admin/fai/class_faiManagement.inc:255 admin/fai/class_faiManagement.inc:329
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/class_faiManagement.inc:854 admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiTemplate.inc:212 admin/fai/tabsVariable.inc:33
 #: admin/fai/tabsPackage.inc:33 admin/fai/class_faiScript.inc:229
 #: admin/fai/class_FAI.inc:556 admin/fai/class_faiScriptEntry.inc:59
@@ -148,9 +149,6 @@ msgstr "置顶"
 #: admin/fai/class_faiHookEntry.inc:62 admin/fai/class_faiHookEntry.inc:65
 #: admin/fai/class_faiVariable.inc:142 admin/fai/class_faiSummaryTab.inc:94
 #: admin/fai/tabsProfile.inc:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:219
 #: admin/systems/services/repository/class_servRepository.inc:159
 #: admin/systems/services/repository/class_servRepository.inc:214
 #: admin/systems/services/repository/class_servRepository.inc:219
@@ -172,7 +170,7 @@ msgid ""
 "The file encodig has changed from '%s' to '%s'. Do you really want to save?"
 msgstr ""
 
-#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:561
+#: admin/fai/remove.tpl:2 admin/fai/class_faiManagement.inc:562
 #: admin/fai/remove_branch.tpl:2
 msgid "Warning"
 msgstr "警告"
@@ -204,19 +202,21 @@ msgstr "设备"
 #: admin/fai/class_faiDiskEntry.inc:680 admin/fai/class_faiDiskEntry.inc:683
 #: admin/fai/class_faiDiskEntry.inc:738 admin/fai/faiProfile.tpl:9
 #: admin/fai/faiScriptEntry.tpl:9 admin/fai/faiScript.tpl:9
-#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-list.xml:28
-#: admin/fai/faiHook.tpl:9 admin/fai/class_faiProfile.inc:390
-#: admin/fai/class_faiProfile.inc:400 admin/fai/class_faiProfile.inc:473
-#: admin/fai/faiPartitionTableEntry.tpl:6 admin/fai/faiHookEntry.tpl:9
-#: admin/fai/class_faiManagement.inc:853 admin/fai/class_faiManagement.inc:859
+#: admin/fai/faiPackage.tpl:9 admin/fai/classSelect/selectClass-filter.tpl:13
+#: admin/fai/classSelect/selectClass-list.xml:28 admin/fai/faiHook.tpl:9
+#: admin/fai/class_faiProfile.inc:390 admin/fai/class_faiProfile.inc:400
+#: admin/fai/class_faiProfile.inc:473 admin/fai/faiPartitionTableEntry.tpl:6
+#: admin/fai/faiHookEntry.tpl:9 admin/fai/class_faiManagement.inc:854
+#: admin/fai/class_faiManagement.inc:860
 #: admin/fai/class_faiVariableEntry.inc:90
 #: admin/fai/class_faiVariableEntry.inc:99
 #: admin/fai/class_faiVariableEntry.inc:102
 #: admin/fai/class_faiVariableEntry.inc:137
 #: admin/fai/class_faiTemplate.inc:421 admin/fai/class_faiTemplate.inc:544
 #: admin/fai/class_askClassName.inc:142 admin/fai/class_askClassName.inc:146
-#: admin/fai/class_askClassName.inc:150
+#: admin/fai/class_askClassName.inc:150 admin/fai/class_askClassName.inc:154
 #: admin/fai/packageSelect/selectPackage-list.xml:40
+#: admin/fai/packageSelect/selectPackage-filter.tpl:18
 #: admin/fai/class_faiScript.inc:327 admin/fai/class_faiScript.inc:483
 #: admin/fai/class_faiScript.inc:645 admin/fai/class_faiScriptEntry.inc:137
 #: admin/fai/class_faiScriptEntry.inc:142
@@ -227,11 +227,11 @@ msgstr "设备"
 #: admin/fai/class_faiHookEntry.inc:145 admin/fai/class_faiHookEntry.inc:150
 #: admin/fai/class_faiHookEntry.inc:153 admin/fai/class_faiHookEntry.inc:196
 #: admin/fai/class_faiVariable.inc:296 admin/fai/class_faiVariable.inc:397
-#: admin/fai/faiPartition.tpl:7 admin/fai/class_faiPackage.inc:544
-#: admin/fai/class_faiPackage.inc:669 admin/fai/class_faiTemplateEntry.inc:233
+#: admin/fai/faiPartition.tpl:7 admin/fai/fai-filter.tpl:59
+#: admin/fai/class_faiPackage.inc:544 admin/fai/class_faiPackage.inc:669
+#: admin/fai/class_faiTemplateEntry.inc:233
 #: admin/fai/class_faiTemplateEntry.inc:299
 #: admin/fai/class_faiSummaryTab.inc:348 admin/fai/faiPartitionTable.tpl:9
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:214
 #: admin/systems/services/repository/class_servRepository.inc:214
 msgid "Name"
 msgstr "名称"
@@ -570,7 +570,6 @@ msgid "List of scripts"
 msgstr "脚本列表"
 
 #: admin/fai/faiPackage.tpl:33
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:402
 #: admin/systems/services/repository/servRepositorySetup.tpl:1
 #: admin/systems/services/repository/class_servRepository.inc:402
 msgid "Repository"
@@ -622,7 +621,7 @@ msgid "Please select the desired entries"
 msgstr "请选择一个打印机或者取消。"
 
 #: admin/fai/classSelect/selectClass-list.xml:15
-#: admin/fai/class_faiManagement.inc:1142
+#: admin/fai/class_faiManagement.inc:1143
 #: admin/fai/packageSelect/selectPackage-list.xml:14 admin/fai/fai-list.xml:15
 msgid "FAI"
 msgstr "自动化安装"
@@ -658,7 +657,7 @@ msgid "Package bundle"
 msgstr "软件包集合"
 
 #: admin/fai/classSelect/class_classSelect.inc:58
-#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1018
+#: admin/fai/class_faiProfile.inc:292 admin/fai/class_faiManagement.inc:1019
 #: admin/fai/class_askClassName.inc:79 admin/fai/class_faiGroupHandle.inc:100
 #: admin/fai/fai-list.xml:94 admin/fai/class_faiProfileEntry.inc:143
 #: admin/fai/class_faiPartitionTable.inc:784
@@ -667,7 +666,6 @@ msgid "Partition table"
 msgstr "分区表"
 
 #: admin/fai/classSelect/selectClass-list.tpl:13
-#: admin/fai/packageSelect/selectPackage-list.tpl:13
 msgid "Base"
 msgstr "位置"
 
@@ -705,7 +703,7 @@ msgstr "关闭"
 msgid "No class specified for this profile!"
 msgstr ""
 
-#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1028
+#: admin/fai/class_faiProfile.inc:465 admin/fai/class_faiManagement.inc:1029
 #: admin/fai/class_askClassName.inc:84 admin/fai/class_faiGroupHandle.inc:110
 #: admin/fai/fai-list.xml:58
 #, fuzzy
@@ -735,7 +733,7 @@ msgid "Software deployment"
 msgstr "系统管理"
 
 #: admin/fai/class_faiManagement.inc:26
-msgid "Manage software packages and deployment reciepes"
+msgid "Manage software packages and deployment recipes"
 msgstr ""
 
 #: admin/fai/class_faiManagement.inc:204
@@ -770,8 +768,8 @@ msgstr "软件包列表"
 
 #: admin/fai/class_faiManagement.inc:226 admin/fai/class_faiManagement.inc:241
 #: admin/fai/class_faiManagement.inc:396 admin/fai/class_faiManagement.inc:456
-#: admin/fai/class_faiManagement.inc:545 admin/fai/class_faiManagement.inc:640
-#: admin/fai/class_faiManagement.inc:663 admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:546 admin/fai/class_faiManagement.inc:641
+#: admin/fai/class_faiManagement.inc:664 admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
@@ -801,91 +799,90 @@ msgstr ""
 msgid "FAI object"
 msgstr "自动化安装（FAI）对象树"
 
-#: admin/fai/class_faiManagement.inc:542
+#: admin/fai/class_faiManagement.inc:543
 msgid "FAI branch/freeze"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:545
+#: admin/fai/class_faiManagement.inc:546
 #, fuzzy
 msgid "You have no permission to delete this release!"
 msgstr "您无权删除这个发行版！"
 
-#: admin/fai/class_faiManagement.inc:561
+#: admin/fai/class_faiManagement.inc:562
 msgid "Release remove aborted because the release name check failed!"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:638 admin/fai/class_faiManagement.inc:661
+#: admin/fai/class_faiManagement.inc:639 admin/fai/class_faiManagement.inc:662
 #, fuzzy
 msgid "Configuration"
 msgstr "配置文件"
 
-#: admin/fai/class_faiManagement.inc:640 admin/fai/class_faiManagement.inc:663
-#: admin/fai/class_faiManagement.inc:684
+#: admin/fai/class_faiManagement.inc:641 admin/fai/class_faiManagement.inc:664
+#: admin/fai/class_faiManagement.inc:685
 #, fuzzy
 msgid "Branch"
 msgstr "分支"
 
-#: admin/fai/class_faiManagement.inc:790 admin/fai/askClassName.tpl:68
+#: admin/fai/class_faiManagement.inc:791 admin/fai/askClassName.tpl:68
 msgid "Continue"
 msgstr "继续"
 
-#: admin/fai/class_faiManagement.inc:820
-#: admin/fai/packageSelect/class_filterFAIPackages.inc:14
+#: admin/fai/class_faiManagement.inc:821
+#: admin/fai/packageSelect/class_filterFAIPackages.inc:15
 #: admin/fai/class_FAI.inc:574 admin/fai/class_faiPackageConfiguration.inc:35
 #: admin/fai/class_faiPackage.inc:260 admin/fai/class_faiPackage.inc:566
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:357
 #: admin/systems/services/repository/class_servRepository.inc:357
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "在子树中查找"
 
-#: admin/fai/class_faiManagement.inc:825 admin/fai/class_FAI.inc:1178
+#: admin/fai/class_faiManagement.inc:826 admin/fai/class_FAI.inc:1178
 #, fuzzy
 msgid "Fatal error"
 msgstr "终端服务器"
 
-#: admin/fai/class_faiManagement.inc:1020
+#: admin/fai/class_faiManagement.inc:1021
 #: admin/fai/class_faiGroupHandle.inc:102 admin/fai/fai-list.xml:88
 #: admin/fai/class_faiSummaryTab.inc:49
 msgid "Package list"
 msgstr "软件包列表"
 
-#: admin/fai/class_faiManagement.inc:1022
+#: admin/fai/class_faiManagement.inc:1023
 #: admin/fai/class_faiGroupHandle.inc:104 admin/fai/class_faiSummaryTab.inc:44
 msgid "Scripts"
 msgstr "脚本"
 
-#: admin/fai/class_faiManagement.inc:1024
+#: admin/fai/class_faiManagement.inc:1025
 #: admin/fai/class_faiGroupHandle.inc:106 admin/fai/class_faiSummaryTab.inc:46
 msgid "Variables"
 msgstr "变量"
 
-#: admin/fai/class_faiManagement.inc:1026
+#: admin/fai/class_faiManagement.inc:1027
 #: admin/fai/class_faiGroupHandle.inc:108 admin/fai/class_faiSummaryTab.inc:45
 msgid "Hooks"
 msgstr "钩子"
 
-#: admin/fai/class_faiManagement.inc:1030
+#: admin/fai/class_faiManagement.inc:1031
 #: admin/fai/class_faiGroupHandle.inc:112 admin/fai/class_faiSummaryTab.inc:47
 msgid "Templates"
 msgstr "模板"
 
-#: admin/fai/class_faiManagement.inc:1032
+#: admin/fai/class_faiManagement.inc:1033
 #: admin/fai/class_faiGroupHandle.inc:114
 msgid "OPSI netboot product"
 msgstr ""
 
-#: admin/fai/class_faiManagement.inc:1034
+#: admin/fai/class_faiManagement.inc:1035
 #, fuzzy
 msgid "OPSI localboot product"
 msgstr "对象组"
 
-#: admin/fai/class_faiManagement.inc:1136
+#: admin/fai/class_faiManagement.inc:1137
 #, fuzzy
 msgid "FAI releases"
 msgstr "自动化安装（FAI）类"
 
-#: admin/fai/class_faiManagement.inc:1137
+#: admin/fai/class_faiManagement.inc:1138
 #, fuzzy
 msgid "FAI release management"
 msgstr "Asterisk 管理"
@@ -1310,7 +1307,6 @@ msgid "FAI partition table"
 msgstr "新分区表"
 
 #: admin/fai/branch_selector.tpl:2
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:417
 #: admin/systems/services/repository/class_servRepository.inc:417
 #, fuzzy
 msgid "Releases"
@@ -1641,7 +1637,6 @@ msgid "Unknown FAI information source!"
 msgstr "个人信息"
 
 #: admin/fai/class_faiSummaryTab.inc:183
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:201
 #: admin/systems/services/repository/class_servRepository.inc:201
 msgid "You can't use this plugin until FAI is activated."
 msgstr "直到激活 FAI，您不能使用这个插件。"
@@ -1710,17 +1705,24 @@ msgid "Service"
 msgstr "服务"
 
 #: admin/systems/services/repository/repository-list.xml:35
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:419
 #: admin/systems/services/repository/servRepositorySetup.tpl:39
 #: admin/systems/services/repository/class_servRepository.inc:419
 #, fuzzy
 msgid "Sections"
 msgstr "节"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:27
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:339
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:383
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
+#: admin/systems/services/repository/servRepositorySetup.tpl:8
+#: admin/systems/services/repository/class_servRepository.inc:416
+#, fuzzy
+msgid "Parent server"
+msgstr "保留"
+
+#: admin/systems/services/repository/servRepositorySetup.tpl:28
+#: admin/systems/services/repository/class_servRepository.inc:418
+#: admin/systems/services/repository/class_servRepositorySetup.inc:157
+msgid "URL"
+msgstr ""
+
 #: admin/systems/services/repository/class_servRepository.inc:27
 #: admin/systems/services/repository/class_servRepository.inc:339
 #: admin/systems/services/repository/class_servRepository.inc:383
@@ -1730,31 +1732,15 @@ msgstr "节"
 msgid "Repository service"
 msgstr "仓库"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:159
 #: admin/systems/services/repository/class_servRepository.inc:159
 #, fuzzy
 msgid "FAI release"
 msgstr "自动化安装（FAI）类"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:403
 #: admin/systems/services/repository/class_servRepository.inc:403
 msgid "Services"
 msgstr "服务"
 
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:416
-#: admin/systems/services/repository/servRepositorySetup.tpl:8
-#: admin/systems/services/repository/class_servRepository.inc:416
-#, fuzzy
-msgid "Parent server"
-msgstr "保留"
-
-#: admin/systems/services/repository/.svn/tmp/tempfile.3.tmp:418
-#: admin/systems/services/repository/servRepositorySetup.tpl:28
-#: admin/systems/services/repository/class_servRepository.inc:418
-#: admin/systems/services/repository/class_servRepositorySetup.inc:157
-msgid "URL"
-msgstr ""
-
 #~ msgid "List of available packages"
 #~ msgstr "可用软件包列表"
 
diff --git a/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
index 22152dfdd..996a4f841 100644
--- a/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-04-03 16:07+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1184,8 +1185,8 @@ msgstr "Betriebssysteme verwalten"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 "Sie können diesen Hersteller nicht entfernen, er wird noch von folgendem(n) "
 "System(en) verwendet: '%s'"
diff --git a/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
index 8f5fd5be0..d5ac18315 100644
--- a/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-25 00:03+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1029,8 +1030,8 @@ msgstr "adjunto"
 msgid ""
 "You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
-"No puede eliminar este adjunto, está todavía en uso por el(los) sistema(s) '%"
-"s'"
+"No puede eliminar este adjunto, está todavía en uso por el(los) sistema(s) "
+"'%s'"
 
 #: admin/systems/services/glpi/class_glpiAttachmentPool.inc:119
 #: admin/systems/services/glpi/class_glpiAttachmentPool.inc:123
@@ -1176,8 +1177,8 @@ msgstr "Administrar tipos de OS"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 "No puede eliminar este fabricante, está todavía en uso por este(os) sistema"
 "(s) '%s'"
diff --git a/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
index 18811bbe7..206e47acc 100644
--- a/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-07-23 23:06+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1173,8 +1174,8 @@ msgstr "Gérer les types de systèmes d'exploitation"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 "Vous ne pouvez pas effacer ce fournisseur, il est utilisé actuellement par ce"
 "(s) système(s) '%s'"
diff --git a/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
index 9e0cfec71..954427e37 100644
--- a/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1245,8 +1246,8 @@ msgstr "Utenti di Dominio"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:99
diff --git a/gosa-plugins/glpi/locale/messages.po b/gosa-plugins/glpi/locale/messages.po
index 56d7c144e..aed081eb0 100644
--- a/gosa-plugins/glpi/locale/messages.po
+++ b/gosa-plugins/glpi/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1121,8 +1122,8 @@ msgstr ""
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:99
diff --git a/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
index ca887cf99..278f5fa60 100644
--- a/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1194,8 +1195,8 @@ msgstr "OS-types beheren"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 "U kunt deze fabrikant niet verwijderen, aangezien deze nog steeds in gebruik "
 "is door deze systemen: '%s'"
diff --git a/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
index e7e327560..b992f746d 100644
--- a/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-09-05 15:29+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -207,8 +208,8 @@ msgid ""
 "You can't delete this cartridge type, it is still in use by this printer(s) "
 "'%s'."
 msgstr ""
-"Nie można usunąć tego typu kartridża. Jest wciąż używany przez drukarkę(i) '%"
-"s'."
+"Nie można usunąć tego typu kartridża. Jest wciąż używany przez drukarkę(i) "
+"'%s'."
 
 #: admin/systems/services/glpi/class_glpiPrinterCartridges.inc:158
 msgid "Cartridges"
@@ -1151,11 +1152,11 @@ msgstr "Zarządzaj typami systemów operacyjnych"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
-"Nie można usunąć tego producenta, jest on wciąż używany przez te system(y) '%"
-"s'"
+"Nie można usunąć tego producenta, jest on wciąż używany przez te system(y) "
+"'%s'"
 
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:99
 msgid "Please specify a name."
diff --git a/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
index 9633bcd4c..b5856a6be 100644
--- a/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1274,8 +1275,8 @@ msgstr "Пользователи домена"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr ""
 
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:99
diff --git a/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po
index 1e271facf..d16d590e0 100644
--- a/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/glpi/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1145,8 +1146,8 @@ msgstr "管理操作系统类型"
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:53
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"You can't delete this manufacturer, it is still in use by these system(s) "
+"'%s'"
 msgstr "您不能删除这个制造商，它仍然被这些系统使用 '%s'"
 
 #: admin/systems/services/glpi/class_glpiManufacturer.inc:99
diff --git a/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po
index 245c6f785..dfc3e051c 100644
--- a/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-07-28 08:45+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -152,7 +153,8 @@ msgstr "Dies tut etwas"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr "Fehler"
@@ -264,7 +266,7 @@ msgstr ""
 "'Abbrechen' zum Abbruch."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Basis"
@@ -282,40 +284,32 @@ msgstr "Listenname"
 msgid "Name of blocklist"
 msgstr "Name der Sperrliste"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr "Wählen Sie eine Basis"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Typ"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Wählen Sie, ob ein- oder abgehende Rufe gefiltert werden sollen"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Beschreibung"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Beschreibender Text zu dieser Sperrliste"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "Gesperrte Nummern"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Information"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "Nummern können auch Platzhalter enthalten."
 
@@ -324,20 +318,22 @@ msgid "List of blocklists"
 msgstr "Liste der Sperrlisten"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 msgid "Send blocklist"
 msgstr "Sende-Sperrliste"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 msgid "Receive blocklist"
 msgstr "Emfangs-Sperrliste"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Name"
 
@@ -350,7 +346,7 @@ msgid "Create"
 msgstr "Anlegen"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 msgid "Blocklist"
 msgstr "Sperrliste"
 
@@ -375,40 +371,40 @@ msgid "Blocklist management"
 msgstr "Sperrlistenverwaltung"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 msgid "Fax blocklists"
 msgstr "Fax-Sperrlisten"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "senden"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "empfangen"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 msgid "Blocklist type"
 msgstr "Typ der Sperrliste"
 
@@ -452,7 +448,7 @@ msgstr "Mehrfaches Bearbeiten"
 msgid "Fax number for GOfax to trigger on"
 msgstr "Fax-Nummer, auf die GOfax ansprechen soll"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Sprache"
 
@@ -460,7 +456,7 @@ msgstr "Sprache"
 msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Geben Sie die Kommunikations-Sprache für das Fax to Mail-Gateway an"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Auslieferungsformat"
 
@@ -480,11 +476,11 @@ msgstr "Temporäres Abschalten der Fax-Benutzung"
 msgid "Deliver fax as mail to"
 msgstr "Fax als Mail ausliefern an"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Als Mail ausliefern"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Fax an Drucker weiterleiten"
 
@@ -543,35 +539,35 @@ msgstr "zurück"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr "Die Mailzustellung wurde ohne Zieladresse angefordert!"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "Mail address"
 msgstr "Mail-Adresse"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr "ihr-name@ihre-domain.com"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr "Ausdruck wurden ohne Zieldrucker angefordert!"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 msgid "Fax account settings"
 msgstr "Fax-Konto-Einstellungen"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 msgid "Alternate fax number"
 msgstr "Alternative Fax-Nummer"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr "FAX aktivieren/deaktivieren"
 
@@ -633,89 +629,3 @@ msgstr "Informationen der Fax-Datenbank"
 #: admin/systems/services/gofax/goFaxServer.tpl:4
 msgid "FAX DB user"
 msgstr "Fax-DB Benutzer"
-
-#~ msgid "Update"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "Submit"
-#~ msgstr "Übertragen"
-
-#~ msgid ""
-#~ "Please double check if your really want to do this since there is no way "
-#~ "for GOsa to get your data back."
-#~ msgstr ""
-#~ "Bitte überprüfen Sie genau, was Sie tun. GOsa hat keine Möglichkeit, die "
-#~ "Daten wiederherzustellen."
-
-#~ msgid "Select all"
-#~ msgstr "Alle auswählen"
-
-#~ msgid "Department"
-#~ msgstr "Abteilung"
-
-#~ msgid "Show send blocklists"
-#~ msgstr "Zeige Sperrlisten für abgehende Rufe"
-
-#~ msgid "Show receive blocklists"
-#~ msgstr "Zeige eingehende Sperrlisten"
-
-#~ msgid "Regular expression for matching list names"
-#~ msgstr "Regulärer Ausdruck zum Erkennen von Sperrlisten-Namen"
-
-#~ msgid "Submit department"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "edit"
-#~ msgstr "Bearbeiten"
-
-#~ msgid "Edit user"
-#~ msgstr "Benutzer bearbeiten"
-
-#~ msgid "delete"
-#~ msgstr "Entfernen"
-
-#~ msgid "Delete user"
-#~ msgstr "Benutzer entfernen"
-
-#~ msgid "Number of listed '%s'"
-#~ msgstr "Anzahl der angezeigen '%s'"
-
-#~ msgid "blocklists"
-#~ msgstr "Sperrlisten"
-
-#~ msgid "departments"
-#~ msgstr "Abteilungen"
-
-#~ msgid "FAX blocklists"
-#~ msgstr "Fax-Sperrlisten"
-
-#~ msgid "Permission"
-#~ msgstr "Berechtigung"
-
-#~ msgid "blocklist"
-#~ msgstr "Sperrliste"
-
-#~ msgid "Copy"
-#~ msgstr "Kopieren"
-
-#~ msgid "Cut"
-#~ msgstr "Ausschneiden"
-
-#~ msgid "Paste"
-#~ msgstr "Einfügen"
-
-#~ msgid "cut"
-#~ msgstr "Ausschneiden"
-
-#~ msgid "Cut this entry"
-#~ msgstr "Diesen Eintrag ausschneiden"
-
-#~ msgid "copy"
-#~ msgstr "Kopieren"
-
-#~ msgid "Copy this entry"
-#~ msgstr "Diesen Eintrag kopieren"
-
-#, fuzzy
-#~ msgid "Faxi number"
-#~ msgstr "Faxnummer"
diff --git a/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po
index 5bacd8747..7f9c8e65c 100644
--- a/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 23:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,7 +151,8 @@ msgstr "Esto hace algo"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr "Error"
@@ -262,7 +264,7 @@ msgstr ""
 "<i>Cancelar</i> para Abortar."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Base"
@@ -280,40 +282,32 @@ msgstr "Nombre de la lista"
 msgid "Name of blocklist"
 msgstr "Nombre de la lista de bloqueos"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Elija el subárbol donde colocar el grupo"
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr "Seleccione una base"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Tipo"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Descripción"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Descripción de esta lista de bloqueos"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "Números bloqueados"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Información"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "Los números también pueden contener comodines."
 
@@ -322,20 +316,22 @@ msgid "List of blocklists"
 msgstr "Lista de listas de bloqueos"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 msgid "Send blocklist"
 msgstr "Lista de bloqueo salientes"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 msgid "Receive blocklist"
 msgstr "Listas de bloqueos entrantes"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Nombre"
 
@@ -348,7 +344,7 @@ msgid "Create"
 msgstr "Crear"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 msgid "Blocklist"
 msgstr "Lista de bloqueo"
 
@@ -373,40 +369,40 @@ msgid "Blocklist management"
 msgstr "Administración de listas de bloqueo"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 msgid "Fax blocklists"
 msgstr "Lista de bloqueos de Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "enviar"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "recibir"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 msgid "Blocklist type"
 msgstr "Tipo de lista de bloqueo"
 
@@ -450,7 +446,7 @@ msgstr "Edición multiple"
 msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax para activar GOfax"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Idioma"
 
@@ -460,7 +456,7 @@ msgstr ""
 "Especificar el lenguaje de comunicación de GOfax para la pasarela de fax a "
 "correo"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato de envío"
 
@@ -480,11 +476,11 @@ msgstr "Desactivación temporal del uso del fax"
 msgid "Deliver fax as mail to"
 msgstr "Enviar fax como correo electrónico a"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrónico"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -542,38 +538,38 @@ msgstr "atrás"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 "¡Ha seleccionado envío de correo, pero no se ha introducido ninguna "
 "dirección de correo!"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr "your-name@your-domain.com"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 "¡Ha seleccionado impresión, pero no se ha introducido ninguna impresora!"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 msgid "Fax account settings"
 msgstr "Configuración cuenta de FAX"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 msgid "Alternate fax number"
 msgstr "Número de FAX alternativo"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr "Activar/desactivar FAX"
 
@@ -636,6 +632,12 @@ msgstr "Información de la base de datos del FAX"
 msgid "FAX DB user"
 msgstr "Base de datos de usuarios de FAX"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Elija el subárbol donde colocar el grupo"
+
+#~ msgid "Select a base"
+#~ msgstr "Seleccione una base"
+
 #~ msgid "Update"
 #~ msgstr "Actualizar"
 
diff --git a/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po
index 39736881e..fc6425a62 100644
--- a/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 22:24+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,7 +147,8 @@ msgstr "Ceci fait quelque chose"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr "Erreur"
@@ -259,7 +261,7 @@ msgstr ""
 "'Annuler' pour abandonner."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Base"
@@ -277,40 +279,33 @@ msgstr "Liste des noms"
 msgid "Name of blocklist"
 msgstr "Nom de la liste rouge"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Sélectionnez la branche où sera placée le groupe"
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr "Sélectionnez une base"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Type"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
+msgstr ""
+"Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Description"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Texte descriptif pour cette liste rouge"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "Numéros bloqués"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Information"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "Les nombres peuvent aussi contenir des jokers."
 
@@ -319,20 +314,22 @@ msgid "List of blocklists"
 msgstr "Liste des listes rouges"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 msgid "Send blocklist"
 msgstr "Afficher les listes rouges en envoi"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 msgid "Receive blocklist"
 msgstr "Afficher les listes rouges en réception"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Nom"
 
@@ -345,7 +342,7 @@ msgid "Create"
 msgstr "Créer"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 msgid "Blocklist"
 msgstr "Listes Rouges"
 
@@ -370,40 +367,40 @@ msgid "Blocklist management"
 msgstr "Configuration des listes rouges"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 msgid "Fax blocklists"
 msgstr "Liste Rouge des Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "envoyer"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "recevoir"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 msgid "Blocklist type"
 msgstr "Type de liste rouge"
 
@@ -447,7 +444,7 @@ msgstr "Edition multiple"
 msgid "Fax number for GOfax to trigger on"
 msgstr "Numéro de fax pour lesquels GOfax s'activera"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Langue"
 
@@ -457,7 +454,7 @@ msgstr ""
 "Indiquez le le protocole de communication GOfax pour les fax vers la "
 "passerelle de messagerie"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Format de distribution"
 
@@ -479,11 +476,11 @@ msgstr "Désactiver temporairement l'utilisation du fax"
 msgid "Deliver fax as mail to"
 msgstr "Délivrer les fax comme des messages à"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Délivrer les fax comme des messages"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Imprimer directement les fax"
 
@@ -542,37 +539,37 @@ msgstr "retour"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 "L'envoi d'un message à été demandé alors que l'adresse du destinataire n'est "
 "pas défini !"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "Mail address"
 msgstr "Adresse de messagerie"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr "votre-nom@votre-domaine.com"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr "L'impression à été demandé alors que l'imprimante n'est pas définie !"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 msgid "Fax account settings"
 msgstr "Paramètres du compte FAX"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 msgid "Alternate fax number"
 msgstr "Numéros de fax alternatif"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr "Activer/désactiver le fax"
 
@@ -635,3 +632,8 @@ msgstr "Base de données des FAX"
 msgid "FAX DB user"
 msgstr "utilisateur de la base de données du FAX"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Sélectionnez la branche où sera placée le groupe"
+
+#~ msgid "Select a base"
+#~ msgstr "Sélectionnez une base"
diff --git a/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po
index 4ff8a53b6..5562bf013 100644
--- a/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -156,7 +157,8 @@ msgstr "Questo fa qualcosa"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr ""
@@ -280,7 +282,7 @@ msgstr ""
 "i> per abortire."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Base"
@@ -300,43 +302,34 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "Name of blocklist"
 msgstr "Data di nascita"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Scegli il subtree dove mettere il gruppo"
-
-#: gofax/blocklists/generic.tpl:26
-#, fuzzy
-msgid "Select a base"
-msgstr "Rimuovi"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Tipo"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Descrizione"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 #, fuzzy
 msgid "Descriptive text for this blocklist"
 msgstr "Nome descrittivo del gruppo"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 #, fuzzy
 msgid "Blocked numbers"
 msgstr "Forza numero ID"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Informazioni"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
@@ -345,22 +338,24 @@ msgid "List of blocklists"
 msgstr "Lista delle liste di blocchi"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Liste di blocco"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Lista delle liste di blocchi"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Cognome"
 
@@ -373,7 +368,7 @@ msgid "Create"
 msgstr "Creare"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 #, fuzzy
 msgid "Blocklist"
 msgstr "Liste di blocco"
@@ -400,43 +395,43 @@ msgid "Blocklist management"
 msgstr "Riferimenti"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 #, fuzzy
 msgid "Fax blocklists"
 msgstr "Liste blocco FAX"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 #, fuzzy
 msgid "Phone number"
 msgstr "Numero di telefono"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "invia"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "ricevi"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 #, fuzzy
 msgid "Blocklist type"
 msgstr "Liste di blocco"
@@ -486,7 +481,7 @@ msgstr ""
 msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Lingua"
 
@@ -494,7 +489,7 @@ msgstr "Lingua"
 msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato di recapito"
 
@@ -514,11 +509,11 @@ msgstr "Disabilita temporaneamente l'uso del Fax"
 msgid "Deliver fax as mail to"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Recapita Fax come mail"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Recapita Fax alla stampante"
 
@@ -579,38 +574,38 @@ msgstr "Indietro"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "Mail address"
 msgstr "Indirizzo principale"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 #, fuzzy
 msgid "Fax account settings"
 msgstr "Impostazioni Samba"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "Numeri di Fax alternativi"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr ""
 
@@ -679,6 +674,13 @@ msgstr "Informazioni organizzazione"
 msgid "FAX DB user"
 msgstr ""
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Scegli il subtree dove mettere il gruppo"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Rimuovi"
+
 #, fuzzy
 #~ msgid "Select all"
 #~ msgstr "Rimuovi"
diff --git a/gosa-plugins/gofax/locale/messages.po b/gosa-plugins/gofax/locale/messages.po
index 4da1c23eb..8ecf0064a 100644
--- a/gosa-plugins/gofax/locale/messages.po
+++ b/gosa-plugins/gofax/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -148,7 +149,8 @@ msgstr ""
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr ""
@@ -256,7 +258,7 @@ msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr ""
@@ -274,40 +276,32 @@ msgstr ""
 msgid "Name of blocklist"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr ""
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr ""
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr ""
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr ""
 
@@ -316,20 +310,22 @@ msgid "List of blocklists"
 msgstr ""
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 msgid "Send blocklist"
 msgstr ""
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 msgid "Receive blocklist"
 msgstr ""
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr ""
 
@@ -342,7 +338,7 @@ msgid "Create"
 msgstr ""
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 msgid "Blocklist"
 msgstr ""
 
@@ -367,40 +363,40 @@ msgid "Blocklist management"
 msgstr ""
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 msgid "Fax blocklists"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Phone number"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 msgid "LDAP error"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr ""
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 msgid "Blocklist type"
 msgstr ""
 
@@ -444,7 +440,7 @@ msgstr ""
 msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr ""
 
@@ -452,7 +448,7 @@ msgstr ""
 msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr ""
 
@@ -472,11 +468,11 @@ msgstr ""
 msgid "Deliver fax as mail to"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr ""
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr ""
 
@@ -533,35 +529,35 @@ msgstr ""
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "Mail address"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 msgid "Fax account settings"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 msgid "Alternate fax number"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr ""
 
diff --git a/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po
index 0a18e2209..b87782ea6 100644
--- a/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -151,7 +152,8 @@ msgstr "Dit doet iets"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr "Fout"
@@ -278,7 +280,7 @@ msgstr ""
 "om te annuleren."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Basis"
@@ -296,40 +298,32 @@ msgstr "Lijstnaam"
 msgid "Name of blocklist"
 msgstr "Naam van de blokkeerlijst"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr "Selecteer een basis"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Type"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Omschrijving"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Beschrijving van deze blokkeerlijst"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "Geblokkeerde nummers"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Informatie"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "Nummers kunnen ook wildcards (*?) bevatten."
 
@@ -338,22 +332,24 @@ msgid "List of blocklists"
 msgstr "Lijst met blokkeerlijsten"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Toon verstuur blokkeerlijsten"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Toon ontvangst blokkeerlijsten"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Naam"
 
@@ -366,7 +362,7 @@ msgid "Create"
 msgstr "Aanmaken"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 #, fuzzy
 msgid "Blocklist"
 msgstr "Blokkeerlijsten"
@@ -392,43 +388,43 @@ msgid "Blocklist management"
 msgstr "Blokkeerlijst beheer"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 #, fuzzy
 msgid "Fax blocklists"
 msgstr "Fax blokkades"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 #, fuzzy
 msgid "Phone number"
 msgstr "Geblokkeerde nummers"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "versturen"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "ontvangen"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 #, fuzzy
 msgid "Blocklist type"
 msgstr "Blokkeerlijst naam"
@@ -473,7 +469,7 @@ msgstr ""
 msgid "Fax number for GOfax to trigger on"
 msgstr "Fax nummer waarop GOfax moet reageren"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Taal"
 
@@ -481,7 +477,7 @@ msgstr "Taal"
 msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Specificeer de GOfax communicatie taal voor de Fax naar E-mail gateway"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Aflever formaat"
 
@@ -501,11 +497,11 @@ msgstr "Schakel Fax gebruik tijdelijk uit"
 msgid "Deliver fax as mail to"
 msgstr "Lever Fax als E-mail af aan"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Lever Fax als E-mail af"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Lever Fax af op printer"
 
@@ -566,39 +562,39 @@ msgstr "terug"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 #, fuzzy
 msgid "Mail address"
 msgstr "Het E-mail adres dat u opgegeven heeft is ongeldig."
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 #, fuzzy
 msgid "Fax account settings"
 msgstr "Samba Instellingen"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "Alternatieve Fax nummers"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr ""
 
@@ -666,6 +662,12 @@ msgstr "Free Busy informatie"
 msgid "FAX DB user"
 msgstr "FAX DB gebruiker"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
+
+#~ msgid "Select a base"
+#~ msgstr "Selecteer een basis"
+
 #~ msgid "Submit"
 #~ msgstr "Verwerk"
 
diff --git a/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po
index aa044c225..1fc55e1b3 100644
--- a/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,7 +147,8 @@ msgstr "To robi coś"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr "Błąd"
@@ -267,7 +269,7 @@ msgstr ""
 "anulować."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Kontener"
@@ -285,40 +287,32 @@ msgstr "Nazwa listy"
 msgid "Name of blocklist"
 msgstr "Nazwa bloklisty"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Wybierz poddrzewo do umieszczenia grupy"
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr "Wybierz bazę"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Typ"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Wybierz, czy filtrować nadchodzące czy przychodzące rozmowy"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Opis"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Opis tej bloklisty"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "Blokowane numery"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Informacja"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "Numery mogą również zawierać maski"
 
@@ -327,20 +321,22 @@ msgid "List of blocklists"
 msgstr "Lista bloklist"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 msgid "Send blocklist"
 msgstr "Bloklista wysyłania"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 msgid "Receive blocklist"
 msgstr "Bloklista otrzymywania"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Imię"
 
@@ -353,7 +349,7 @@ msgid "Create"
 msgstr "Utwórz"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 #, fuzzy
 msgid "Blocklist"
 msgstr "Bloklisty"
@@ -379,43 +375,43 @@ msgid "Blocklist management"
 msgstr "Zarządzanie bloklistą"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 #, fuzzy
 msgid "Fax blocklists"
 msgstr "Bloklisty FAX"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 #, fuzzy
 msgid "Phone number"
 msgstr "Blokowane numery"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "wysyłanie"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "odbieranie"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Fax"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 msgid "Blocklist type"
 msgstr "Typ bloklisty"
 
@@ -459,7 +455,7 @@ msgstr ""
 msgid "Fax number for GOfax to trigger on"
 msgstr "Numer faxu dla GOfax dla przełączenia"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Język"
 
@@ -467,7 +463,7 @@ msgstr "Język"
 msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "Podaj język komunikacji GOfax dla bramki fax2mail"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Format dostarczania"
 
@@ -487,11 +483,11 @@ msgstr "Tymczasowo zablokuj używanie faxu"
 msgid "Deliver fax as mail to"
 msgstr "Dostarcz fax jako pocztę do"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Dostarcz fax jako pocztę"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Dostarcz fax na drukarkę"
 
@@ -550,37 +546,37 @@ msgstr "wróć"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 #, fuzzy
 msgid "Mail address"
 msgstr "Adres email który podano jest nieprawidłowy."
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 msgid "Fax account settings"
 msgstr "Ustawienia konta fax"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "Alternatywne numery faxu"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr "Włącz/Wyłącz fax"
 
@@ -645,6 +641,12 @@ msgstr "Informacje bazy FAX"
 msgid "FAX DB user"
 msgstr "Użytkownik bazy FAX"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia grupy"
+
+#~ msgid "Select a base"
+#~ msgstr "Wybierz bazę"
+
 #~ msgid "Update"
 #~ msgstr "Aktualizuj"
 
diff --git a/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po
index bb960402e..73280aff2 100644
--- a/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,7 +147,8 @@ msgstr "Что-то будет"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr ""
@@ -273,7 +275,7 @@ msgstr ""
 "нажмите <i>Отмена</i>."
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "Ветка"
@@ -291,41 +293,32 @@ msgstr "Список"
 msgid "Name of blocklist"
 msgstr "Имя стоп-листа"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "Выберите ветку для группы"
-
-#: gofax/blocklists/generic.tpl:26
-#, fuzzy
-msgid "Select a base"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "Тип"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "Описание"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Описание стоп-листа"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "Блокируемые номера"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "Информация"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "Вместо точных номеров можно использовать шаблоны."
 
@@ -334,22 +327,24 @@ msgid "List of blocklists"
 msgstr "Стоп-листы"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Показать стоп-листы отправки"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Показать стоп-листы получения"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "Фамилия"
 
@@ -362,7 +357,7 @@ msgid "Create"
 msgstr "Создать"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 #, fuzzy
 msgid "Blocklist"
 msgstr "\"Черные списки\""
@@ -388,43 +383,43 @@ msgid "Blocklist management"
 msgstr "Управление \"черными списками\""
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 #, fuzzy
 msgid "Fax blocklists"
 msgstr "Стоп-лист номеров (факсы)"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 #, fuzzy
 msgid "Phone number"
 msgstr "Блокируемые номера"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "отправка"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "получение"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "Факс"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 #, fuzzy
 msgid "Blocklist type"
 msgstr "Управление \"черными списками\""
@@ -469,7 +464,7 @@ msgstr ""
 msgid "Fax number for GOfax to trigger on"
 msgstr "Номер факса, для которого сработает GOfax"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "Язык"
 
@@ -478,7 +473,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr ""
 "Укаэите предпочтительный язык для получения сообщений о факсах по эл. почте"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Формат доставки"
 
@@ -499,11 +494,11 @@ msgstr "Временно отключить использование факс
 msgid "Deliver fax as mail to"
 msgstr "Отправлять факсы по эл. почте"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "Отправлять факсы по эл. почте"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "Отправлять факсы на принтер"
 
@@ -562,39 +557,39 @@ msgstr "Назад"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 #, fuzzy
 msgid "Mail address"
 msgstr "Введенный вами адрес уже используется."
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 #, fuzzy
 msgid "Fax account settings"
 msgstr "Настройки Samba"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "Альтернативные номера факсов"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr ""
 
@@ -666,6 +661,13 @@ msgstr "Базы данных"
 msgid "FAX DB user"
 msgstr "Показать пользователей факсов"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Выберите ветку для группы"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Выберите, чтобы просмотреть серверы"
+
 #~ msgid ""
 #~ "Please double check if your really want to do this since there is no way "
 #~ "for GOsa to get your data back."
diff --git a/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po
index 39de18b4f..12b903254 100644
--- a/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofax/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -149,7 +150,8 @@ msgstr "******"
 #: gofax/faxreports/class_faxreport.inc:135
 #: gofax/faxreports/class_faxreport.inc:158
 #: gofax/faxreports/class_faxreport.inc:304
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
+#: gofax/blocklists/class_blocklistGeneric.inc:154
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 msgid "Error"
 msgstr "错误"
@@ -270,7 +272,7 @@ msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
 #: gofax/blocklists/blocklist-list.tpl:13 gofax/blocklists/generic.tpl:17
-#: gofax/blocklists/class_blocklistGeneric.inc:387
+#: gofax/blocklists/class_blocklistGeneric.inc:369
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.tpl:13
 msgid "Base"
 msgstr "位置"
@@ -288,40 +290,32 @@ msgstr "列表名称"
 msgid "Name of blocklist"
 msgstr "黑名单名称"
 
-#: gofax/blocklists/generic.tpl:20
-msgid "Choose subtree to place group in"
-msgstr "选择来放置组的子树"
-
-#: gofax/blocklists/generic.tpl:26
-msgid "Select a base"
-msgstr "选择一个位置"
-
-#: gofax/blocklists/generic.tpl:40
+#: gofax/blocklists/generic.tpl:34
 msgid "Type"
 msgstr "类型"
 
-#: gofax/blocklists/generic.tpl:43
+#: gofax/blocklists/generic.tpl:37
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "选择过滤打入电话还是打出电话"
 
-#: gofax/blocklists/generic.tpl:51 gofax/blocklists/blocklist-list.xml:57
-#: gofax/blocklists/class_blocklistGeneric.inc:386
+#: gofax/blocklists/generic.tpl:45 gofax/blocklists/blocklist-list.xml:57
+#: gofax/blocklists/class_blocklistGeneric.inc:368
 msgid "Description"
 msgstr "描述"
 
-#: gofax/blocklists/generic.tpl:54
+#: gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "此黑名带描述文字"
 
-#: gofax/blocklists/generic.tpl:68
+#: gofax/blocklists/generic.tpl:62
 msgid "Blocked numbers"
 msgstr "封锁号码"
 
-#: gofax/blocklists/generic.tpl:90
+#: gofax/blocklists/generic.tpl:84
 msgid "Information"
 msgstr "提示信息"
 
-#: gofax/blocklists/generic.tpl:92
+#: gofax/blocklists/generic.tpl:86
 msgid "Numbers can also contain wild cards."
 msgstr "数字也可以包含通配符。"
 
@@ -330,22 +324,24 @@ msgid "List of blocklists"
 msgstr "黑名单列表"
 
 #: gofax/blocklists/blocklist-list.xml:15
-#: gofax/faxaccount/class_gofaxAccount.inc:835
+#: gofax/faxaccount/class_gofaxAccount.inc:834
 #, fuzzy
 msgid "Send blocklist"
 msgstr "显示发送黑名单"
 
 #: gofax/blocklists/blocklist-list.xml:23
-#: gofax/faxaccount/class_gofaxAccount.inc:834
+#: gofax/faxaccount/class_gofaxAccount.inc:833
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "显示接收黑名单"
 
 #: gofax/blocklists/blocklist-list.xml:49
-#: gofax/blocklists/class_blocklistGeneric.inc:219
-#: gofax/blocklists/class_blocklistGeneric.inc:222
-#: gofax/blocklists/class_blocklistGeneric.inc:229
-#: gofax/blocklists/class_blocklistGeneric.inc:385
+#: gofax/blocklists/blocklist-filter.tpl:17
+#: gofax/blocklists/class_blocklistGeneric.inc:196
+#: gofax/blocklists/class_blocklistGeneric.inc:199
+#: gofax/blocklists/class_blocklistGeneric.inc:206
+#: gofax/blocklists/class_blocklistGeneric.inc:367
+#: gofax/faxaccount/faxNumberSelect/faxNumberSelect-filter.tpl:17
 msgid "Name"
 msgstr "名称"
 
@@ -358,7 +354,7 @@ msgid "Create"
 msgstr "创建"
 
 #: gofax/blocklists/blocklist-list.xml:82
-#: gofax/blocklists/class_blocklistGeneric.inc:388
+#: gofax/blocklists/class_blocklistGeneric.inc:370
 #, fuzzy
 msgid "Blocklist"
 msgstr "黑名单"
@@ -384,43 +380,43 @@ msgid "Blocklist management"
 msgstr "黑名单管理"
 
 #: gofax/blocklists/class_blocklistGeneric.inc:9
-#: gofax/blocklists/class_blocklistGeneric.inc:376
-#: gofax/blocklists/class_blocklistGeneric.inc:381
-#: gofax/blocklists/class_blocklistGeneric.inc:382
+#: gofax/blocklists/class_blocklistGeneric.inc:358
+#: gofax/blocklists/class_blocklistGeneric.inc:363
+#: gofax/blocklists/class_blocklistGeneric.inc:364
 #, fuzzy
 msgid "Fax blocklists"
 msgstr "传真黑名单"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:132
+#: gofax/blocklists/class_blocklistGeneric.inc:104
 #: gofax/faxaccount/class_gofaxAccount.inc:258
 #, fuzzy
 msgid "Phone number"
 msgstr "封锁号码"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "send"
 msgstr "发送"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:164
+#: gofax/blocklists/class_blocklistGeneric.inc:136
 msgid "receive"
 msgstr "接收"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:205
-#: gofax/blocklists/class_blocklistGeneric.inc:286
+#: gofax/blocklists/class_blocklistGeneric.inc:182
+#: gofax/blocklists/class_blocklistGeneric.inc:268
 #: gofax/faxaccount/class_gofaxAccount.inc:613
-#: gofax/faxaccount/class_gofaxAccount.inc:742
+#: gofax/faxaccount/class_gofaxAccount.inc:741
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:375
+#: gofax/blocklists/class_blocklistGeneric.inc:357
 #: gofax/faxaccount/generic.tpl:10 gofax/faxaccount/paste_generic.tpl:8
-#: gofax/faxaccount/class_gofaxAccount.inc:817
+#: gofax/faxaccount/class_gofaxAccount.inc:816
 #: gofax/faxaccount/faxNumberSelect/faxNumberSelect-list.xml:56
 msgid "Fax"
 msgstr "传真"
 
-#: gofax/blocklists/class_blocklistGeneric.inc:389
+#: gofax/blocklists/class_blocklistGeneric.inc:371
 #, fuzzy
 msgid "Blocklist type"
 msgstr "黑名单名称"
@@ -465,7 +461,7 @@ msgstr ""
 msgid "Fax number for GOfax to trigger on"
 msgstr "要打开的 GOfax 的传真号码"
 
-#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:828
+#: gofax/faxaccount/generic.tpl:24 gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Language"
 msgstr "语言"
 
@@ -473,7 +469,7 @@ msgstr "语言"
 msgid "Specify the GOfax communication language for fax to mail gateway"
 msgstr "描述传真到邮件网关的 GOfax 通讯语言"
 
-#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:829
+#: gofax/faxaccount/generic.tpl:37 gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "传输格式"
 
@@ -493,11 +489,11 @@ msgstr "临时禁用传真"
 msgid "Deliver fax as mail to"
 msgstr "发送传真至邮件到"
 
-#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:832
+#: gofax/faxaccount/generic.tpl:73 gofax/faxaccount/class_gofaxAccount.inc:831
 msgid "Deliver fax as mail"
 msgstr "发送传真至邮件"
 
-#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:833
+#: gofax/faxaccount/generic.tpl:80 gofax/faxaccount/class_gofaxAccount.inc:832
 msgid "Deliver fax to printer"
 msgstr "发送传真至打印机"
 
@@ -555,39 +551,39 @@ msgstr "返回"
 
 #: gofax/faxaccount/class_gofaxAccount.inc:629
 #: gofax/faxaccount/class_gofaxAccount.inc:633
-#: gofax/faxaccount/class_gofaxAccount.inc:827
+#: gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:641
+#: gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "Mail delivery is requested without target address!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 #, fuzzy
 msgid "Mail address"
 msgstr "您输入的邮件地址无效。"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:643
+#: gofax/faxaccount/class_gofaxAccount.inc:642
 msgid "your-name@your-domain.com"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:649
+#: gofax/faxaccount/class_gofaxAccount.inc:648
 msgid "Printing is requested without a target printer!"
 msgstr ""
 
-#: gofax/faxaccount/class_gofaxAccount.inc:818
+#: gofax/faxaccount/class_gofaxAccount.inc:817
 #, fuzzy
 msgid "Fax account settings"
 msgstr "Samba 设置"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:830
+#: gofax/faxaccount/class_gofaxAccount.inc:829
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "替代传真号码"
 
-#: gofax/faxaccount/class_gofaxAccount.inc:831
+#: gofax/faxaccount/class_gofaxAccount.inc:830
 msgid "Enable/Disable fax"
 msgstr ""
 
@@ -655,6 +651,12 @@ msgstr "系统信息"
 msgid "FAX DB user"
 msgstr "传真数据库用户名"
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "选择来放置组的子树"
+
+#~ msgid "Select a base"
+#~ msgstr "选择一个位置"
+
 #~ msgid "Submit"
 #~ msgstr "提交"
 
diff --git a/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
index 0a3f98da1..d6597a1b5 100644
--- a/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-07-28 08:22+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,7 @@ msgstr "Auf"
 msgid "Down"
 msgstr "Ab"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Optionen"
 
@@ -58,19 +59,17 @@ msgstr "Optionen"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 msgid "Home server"
 msgstr "Home-Server"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Sprache"
 
@@ -193,16 +192,14 @@ msgid "Ring instead of playing background music"
 msgstr "Klingelton statt Hintergrund-Musik"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 msgid "Obsolete entry"
 msgstr "Veralteter Eintrag"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -261,7 +258,7 @@ msgid "Queue length"
 msgstr "Größe der Warteschlange"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 msgid "Number"
 msgstr "Nummer"
 
@@ -272,12 +269,10 @@ msgstr "Asterisk"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -305,32 +300,24 @@ msgstr "Telefonnummer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -340,41 +327,33 @@ msgstr "Fehler"
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Telefon"
 
@@ -602,154 +581,139 @@ msgid "Phone name"
 msgstr "Telefon-Name"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "Wählen Sie eine Basis"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 msgid "phone"
 msgstr "Telefon"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "ja"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "nein"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "Netzwerk-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr "Konnte Eintrag nicht entfernen, da er noch von '%s' verwendet wird!"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Name"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 msgid "Phone generic"
 msgstr "Telefon (Allgemein)"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 msgid "Phone hardware"
 msgstr "Telefon-Hardware"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 msgid "SIP Mode"
 msgstr "SIP Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 msgid "SIP DTMF mode"
 msgstr "SIP DTMF-Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 msgid "SIP Default ip"
 msgstr "SIP Standard IP-Adresse"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr "SIP Qualifizieren"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 msgid "IAX authentication type"
 msgstr "IAX Authentifikations-Typ"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 msgid "IAX secret"
 msgstr "IAX Kennwort"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 msgid "IAX account code"
 msgstr "IAX Konto-Identifikation"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr "IAX Leitungen zusammenfassen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 msgid "IAX permit settings"
 msgstr "IAX Zulassungs-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 msgid "IAX deny settings"
 msgstr "IAX Ablehnungs-Einstellungen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr "CAPI MSN"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr "Hardware-Typ"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Warnung"
 
@@ -801,8 +765,7 @@ msgid "Parameter %s is invalid!"
 msgstr "Der Parameter %s ist ungültig!"
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Information"
 
@@ -814,65 +777,85 @@ msgstr ""
 "Die Anzahl der Parameter für dieses Makro wurde verändert. Bitte "
 "aktualisieren Sie alle Benutzer, die es verwenden!"
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+"Makro kann nicht vom Server '%s' entfernt werden, bitte prüfen Sie die Datenbank! "
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, php-format
 msgid "Application missing in line %s!"
 msgstr "Anwendung fehlt in Zeile %s!"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+msgid "Priority missing in line %s!"
+msgstr "Priorität fehlt in Zeile %s!"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr "Erweiterung fehlt in Zeile %s!"
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr "Doppelte Kombination von 'extension' und 'priority' in Zeile %s!"
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+"Kann Makro nicht auf Server '%s' hinzufügen, bitte prüfen Sie die Datenbank!"
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr "Der Name kann höchstens 20 Zeichen lang sein!"
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 msgid "Macro is still in use!"
 msgstr "Das Makro wird noch verwendet!"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 msgid "Macro is empty!"
 msgstr "Das Makro ist leer!"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "Asterisk macro management"
 msgstr "Asterisk-Makro-Verwaltung"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 msgid "GOfon macro"
 msgstr "GOfon-Makro"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr "Makro-Name"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Angezeigter Name"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 msgid "Macro content and parameter"
 msgstr "Makro-Inhalt und Parameter"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr "Sichtbarkeits-Flag"
 
@@ -880,11 +863,11 @@ msgstr "Sichtbarkeits-Flag"
 msgid "Macro name to be displayed"
 msgstr "Makro-Name der angezeigt wird"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "Sichtbar für Benutzer"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "Makro-Inhalt"
 
@@ -970,16 +953,13 @@ msgid "Voicemail context"
 msgstr "Voicemail-Kontext"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "Voicemail-PIN"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "Telefon-PIN"
 
@@ -991,23 +971,30 @@ msgstr "Aktualisieren"
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+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"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Dies tut etwas"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatisch"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "kein Makro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
@@ -1015,72 +1002,54 @@ msgstr ""
 "Die Telefon-Erweiterung kann nicht in der Datenbank gefunden werden. "
 "Versuchen Sie noch einmal zu Speichern."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "Das Speichern der Einträge abbrechen, um die Datenbank konsistent zu halten."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr "GOsa hat Probleme mit der Datenbank-Definition festgestellt!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr "Bitte Aktivieren Sie das Debuggung für mehr Informationen!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Telefon-Konto erstellen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 msgid "User uid"
 msgstr "Benutzer uid"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr "Das gewählte Makro ist nirgendwo verfügbar!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parameter"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1088,39 +1057,32 @@ msgstr ""
 "Es muss mindestens ein Server mit einer Asterisk-Datenbank bestehen, um ein "
 "Telefon-Konto zu erstellen."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr "1-4 Zeichen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, php-format
 msgid "macro parameter %s"
 msgstr "Makro-Parameter %s"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 "Es ist ein Fehler beim Aktualisieren der Datenbankeinträge aufgetreten!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Benutzer '%s' aus Warteschlange '%s' entfernt."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1129,91 +1091,66 @@ msgstr ""
 "Der zuvor ausgewählte Asterisk Home-Server ('%s') ist nicht mehr verfügbar."
 "Entfernen wurde abgebrochen."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 msgid "Phone account settings"
 msgstr "Telefon-Konto-Einstellungen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Mein Konto"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 msgid "Telephone number"
 msgstr "Telefonnummer"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 msgid "Macro settings"
 msgstr "Makro-Einstellungen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "Phone context"
 msgstr "Telefon-Kontext"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr "Voicemail-Kontext"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 msgid "Telephone pin"
 msgstr "Telefon-PIN"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr "Voicemail-PIN"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr "Es ist momentan kein Asterisk-Server definiert!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr "Der Asterisk-Server ist ungültig!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Die Voicemail-PIN muss 4 Zeichen lang sein!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Die Voicemail-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 msgid "Phone pin contains invalid characters!"
 msgstr "Die Telefon-PIN enthält ungültige Zeichen!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Der Parameter '%s' enthält ungültige Zeichen. '!,#' werden als Feldtrenner "
 "verwendet"
 
-#: gofon/phoneaccount/main.inc:123
-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"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dies tut etwas"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "conferences"
 msgstr "Konferenzen"
@@ -1242,55 +1179,55 @@ msgstr "Typ"
 msgid "Choose subtree to place conference in"
 msgstr "Wählen Sie den Teilbaum, in den die Konferenz eingepflegt werden soll"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 msgid "Select language"
 msgstr "Auswahl der Sprache"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "Lebenszeit (in Tagen)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "PIN voreinstellen"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "Konferenz aufnehmen"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "Format der Audiodatei"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr "Wählen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "Wartemusik bei Halten"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "Sitzungsmenü aktivieren"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "Benachrichtige über Abgang/Zugang von Teilnehmern"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr "Zähle Benutzer"
 
@@ -1299,30 +1236,30 @@ msgid "List of conference rooms"
 msgstr "Liste der Konferenz-Räume"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Konferenz"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 "Kann Eintrag nicht von Server '%s' entfernen, da er scheinbar bereits "
 "entfernt wurde!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr ""
 "Der zuvor ausgewählte Asterisk Anmelde-Server '%s' ist nicht mehr verfügbar."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr "Lebenszeit"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
@@ -1331,45 +1268,45 @@ msgstr ""
 "GOsa hat Probleme mit der Datenbank-Definition festgestellt. Bitte "
 "aktivieren Sie das Debugging für mehr Informationen."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "'%s' wird bereits von '%s' verwendet!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 msgid "Phone conference management"
 msgstr "Telefonkonferenz-Verwaltung"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 msgid "GOfon conference"
 msgstr "GOfon-Konferenz"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 msgid "Conference PIN"
 msgstr "Konferenz-PIN"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 msgid "Activate menu"
 msgstr "Menü aktivieren"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr "Melde Benutzer-Aktivität"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 msgid "Count user"
 msgstr "Zähle Benutzer"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 msgid "Conference type"
 msgstr "Konferenz-Typ"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Format"
 msgstr "Format"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "Besitzer"
 
@@ -1467,6 +1404,12 @@ msgstr "Status"
 msgid "Search returned no results..."
 msgstr "Die Suche verlief ergebnislos..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
+
+#~ msgid "Select a base"
+#~ msgstr "Wählen Sie eine Basis"
+
 #~ msgid "Update"
 #~ msgstr "Aktualisieren"
 
diff --git a/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
index bbe56241e..2c0b345cd 100644
--- a/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 23:37+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +49,7 @@ msgstr "Arriba"
 msgid "Down"
 msgstr "Abajo"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Opciones"
 
@@ -56,19 +57,17 @@ msgstr "Opciones"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 msgid "Home server"
 msgstr "Servidor de inicio"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Idioma"
 
@@ -191,16 +190,14 @@ msgid "Ring instead of playing background music"
 msgstr "Sonar en vez de poner música de fondo"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 msgid "Obsolete entry"
 msgstr "Entrada obsoleta"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -259,7 +256,7 @@ msgid "Queue length"
 msgstr "Longitud de la cola"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 msgid "Number"
 msgstr "Número"
 
@@ -270,12 +267,10 @@ msgstr "asterisk"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -303,32 +298,24 @@ msgstr "número de teléfono"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -338,41 +325,33 @@ msgstr "Error"
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 msgid "LDAP error"
 msgstr "Error LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Teléfono"
 
@@ -600,154 +579,139 @@ msgid "Phone name"
 msgstr "Número de teléfono"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Elija el subárbol donde colocar el grupo"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "Seleccione una base"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 msgid "phone"
 msgstr "Teléfono"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "si"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "no"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "dinámico"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "Configuración de red"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr "¡No se puede eliminar la entrada porque está siendo usada por '%s'!"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Genérico"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 msgid "Phone generic"
 msgstr "Teléfono genérico"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 msgid "Phone hardware"
 msgstr "Teléfono hardware"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 msgid "SIP Mode"
 msgstr "Modo SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 msgid "SIP DTMF mode"
 msgstr "Modo SIP DTMF"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 msgid "SIP Default ip"
 msgstr "Dirección IP por defecto de SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr "Capacidad SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 msgid "IAX authentication type"
 msgstr "Tipo de autentificación IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 msgid "IAX secret"
 msgstr "contraseña IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 msgid "IAX account code"
 msgstr "Código de cuenta IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr "Lineas troncales IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 msgid "IAX permit settings"
 msgstr "Configuración permitida IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 msgid "IAX deny settings"
 msgstr "Configuración denegada IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr "CAPI MSN"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr "Tipo de hardware"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Aviso"
 
@@ -799,8 +763,7 @@ msgid "Parameter %s is invalid!"
 msgstr "¡El parámetro '%s' no es válido!"
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Información"
 
@@ -812,65 +775,84 @@ msgstr ""
 "El número de parámetros para esta macro ha cambiado. ¡Por favor actualice "
 "todos los usuarios que la usen!"
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, php-format
 msgid "Application missing in line %s!"
 msgstr "¡La aplicación falla en linea %s!"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "¡La extensión falla en linea %s!"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr "¡La extensión falla en linea %s!"
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr "¡El nombre tiene 20 caracteres como máximo!"
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 msgid "Macro is still in use!"
 msgstr "La macro está todavía en uso."
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 msgid "Macro is empty!"
 msgstr "¡La macro está vacía!"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "Asterisk macro management"
 msgstr "Administración de macros de Asterisk"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 msgid "GOfon macro"
 msgstr "Macro GOfon"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr "Nombre de la macro"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Nombre a Mostrar"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 msgid "Macro content and parameter"
 msgstr "Contenido y parámetros de la macro"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr "Atributo de visibilidad"
 
@@ -878,11 +860,11 @@ msgstr "Atributo de visibilidad"
 msgid "Macro name to be displayed"
 msgstr "Nombre con el que se mostrara la macro"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "Visible para el usuario"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "Macro de texto"
 
@@ -967,16 +949,13 @@ msgid "Voicemail context"
 msgstr "Contexto de buzón de voz"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "PIN del buzón de correo"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "PIN del Teléfono"
 
@@ -988,95 +967,85 @@ msgstr "Refresco"
 msgid "Phone settings"
 msgstr "Configuración telefónica"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+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"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Esto hace algo"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automático"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "sin macro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "sin definir"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342, php-format
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 "No se puede identificar la extensión telefónica en la base de datos, por "
 "favor intente guardarla de nuevo."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "Cancelar la grabación de las entradas para mantener la consistencia de la "
 "base de datos."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583, php-format
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
+#, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr "¡GOsa ha identificado problemas con su definición de tabla en MYSQL!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr "¡Por favor active depuración para mas información!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 msgid "User uid"
 msgstr "Identificador (UID) de usuario"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr "¡La macro seleccionada no está disponible!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parámetro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1084,39 +1053,32 @@ msgstr ""
 "Debe existir al menos un servidor con una base de datos asterisk para crear "
 "una cuenta telefónica."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr "Entre 1 a 4 caracteres"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, php-format
 msgid "macro parameter %s"
 msgstr "parámetro de macro %s"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 "¡Un error ha ocurrido mientras actualizaba las entradas en la base de datos!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Eliminado usuario '%s' de la cola de teléfono '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "El número teléfono introducido '%s' ya está asignado a '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1125,90 +1087,66 @@ msgstr ""
 "El servidor principal de asterisk seleccionado anteriormente (%s) no está "
 "disponible. Eliminación cancelada."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 msgid "Phone account settings"
 msgstr "Configuración cuenta telefónica"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 msgid "Telephone number"
 msgstr "Número de teléfono"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 msgid "Macro settings"
 msgstr "Parámetros de macro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "Phone context"
 msgstr "Contexto telefónico"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr "Contexto de buzón de voz"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 msgid "Telephone pin"
 msgstr "PIN del teléfono"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr "PIN del buzón de voz"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr "¡No se ha definido el servidor Asterisk!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr "¡El servidor Asterisk no es válido!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "¡El PIN del buzón de voz debe de tener 4 caracteres de largo!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "¡El PIN del buzón de voz tiene caracteres no válidos!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 msgid "Phone pin contains invalid characters!"
 msgstr "¡El PIN del teléfono tiene caracteres no válidos!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "El parámetro %s tiene alguno de los caracteres no válidos '!,#' como "
 "delimitador"
 
-#: gofon/phoneaccount/main.inc:123
-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"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Esto hace algo"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "conferences"
 msgstr "conferencias"
@@ -1237,55 +1175,55 @@ msgstr "Tipo"
 msgid "Choose subtree to place conference in"
 msgstr "Elija el subárbol donde colocar la conferencia"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 msgid "Select language"
 msgstr "Selección de idiomas"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "Duración (en días)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "PIN configurado"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "Grabar conferencia"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "Formato del archivo de audio"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr "Elija subárbol para colocar el departamento"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "Poner música en espera"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "Activar menú de sesión"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "Avisar de usuarios que se unen o dejan la conferencia"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr "Contar usuarios"
 
@@ -1294,17 +1232,17 @@ msgid "List of conference rooms"
 msgstr "Lista de grupos de conferencias"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Conferencia"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 "¡No se puede eliminar la entrada del servidor '%s' porque ha sido eliminada!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
@@ -1312,12 +1250,12 @@ msgstr ""
 "¡El servidor principal asterisk seleccionado previamente ('%s) no está "
 "disponible!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr "Duración"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
@@ -1326,45 +1264,45 @@ msgstr ""
 "GOsa ha identificado problemas con su definición de tabla en MYSQL, por "
 "favor active depuración para mas información."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "¡'%s' está ya asignado a '%s'!"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 msgid "Phone conference management"
 msgstr "Administración de conferencia telefónica"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 msgid "GOfon conference"
 msgstr "Conferencia GOfon"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 msgid "Conference PIN"
 msgstr "PIN de conferencia"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 msgid "Activate menu"
 msgstr "Activar menú"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr "Anunciar actividad de usuario"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 msgid "Count user"
 msgstr "Cuenta de usuario"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 msgid "Conference type"
 msgstr "Tipo de conferencia"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Format"
 msgstr "Formato"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "Propietario"
 
@@ -1462,6 +1400,12 @@ msgstr "Estado"
 msgid "Search returned no results..."
 msgstr "La búsqueda no ha encontrado resultados..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Elija el subárbol donde colocar el grupo"
+
+#~ msgid "Select a base"
+#~ msgstr "Seleccione una base"
+
 #~ msgid "Update"
 #~ msgstr "Actualizar"
 
diff --git a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
index e1aa35e13..2f6474d79 100644
--- a/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-18 22:54+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgstr "Au dessus"
 msgid "Down"
 msgstr "En bas"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Options"
 
@@ -52,19 +53,17 @@ msgstr "Options"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 msgid "Home server"
 msgstr "Serveur Primaire"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Langue"
 
@@ -187,16 +186,14 @@ msgid "Ring instead of playing background music"
 msgstr "Sonner au lieu de mettre une musique d'ambiance"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 msgid "Obsolete entry"
 msgstr "Entrée obsolète"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -255,7 +252,7 @@ msgid "Queue length"
 msgstr "taille de la queue"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 msgid "Number"
 msgstr "Numéro"
 
@@ -266,12 +263,10 @@ msgstr "asterisk"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -299,32 +294,24 @@ msgstr "numéro de téléphone"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -334,41 +321,33 @@ msgstr "Erreur"
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -596,155 +575,140 @@ msgid "Phone name"
 msgstr "Nom du téléphone"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Sélectionnez la branche où sera placée le groupe"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "Sélectionnez une base"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Description"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 msgid "phone"
 msgstr "téléphone"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "oui"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "non"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "dynamique"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "Configuration réseau"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 "Impossible d'éffacer l'entrée parcequ'elle est encore utilisée par '%s' !"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 msgid "IP address"
 msgstr "Adresse ip"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Nom"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 msgid "Phone generic"
 msgstr "Téléphone générique"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 msgid "Phone hardware"
 msgstr "Matériel téléphonique"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 msgid "SIP Mode"
 msgstr "Mode SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 msgid "SIP DTMF mode"
 msgstr "Mode DTMF"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 msgid "SIP Default ip"
 msgstr "SIP Adresse ip par défaut"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr "Qualification SIP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 msgid "IAX authentication type"
 msgstr "Type d'authentification IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 msgid "IAX secret"
 msgstr "Secret IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 msgid "IAX account code"
 msgstr "Code du compte IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr "Trunk IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 msgid "IAX permit settings"
 msgstr "Paramètres de permissions IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 msgid "IAX deny settings"
 msgstr "Paramètres d'interdiction IAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr "MSN CAPI"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr "Type de matériel"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -797,8 +761,7 @@ msgid "Parameter %s is invalid!"
 msgstr "Le paramètre %s est non valide !"
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Information"
 
@@ -810,65 +773,84 @@ msgstr ""
 "Le nombre de paramètres de cette macro à changé. Veuillez mettre à jour tout "
 "les utilisateurs qui l'utilisent !"
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, php-format
 msgid "Application missing in line %s!"
 msgstr "Il y a pas d'application indiquée à la ligne '%s' !"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "Extension manquante à la ligne %s !"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr "Extension manquante à la ligne %s !"
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr "Les noms ne peuvent pas dépasser 20 caractères !"
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 msgid "Macro is still in use!"
 msgstr "Macro encore en utilisation !"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 msgid "Macro is empty!"
 msgstr "La macro est vide !"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "Asterisk macro management"
 msgstr "Gestion des macros d'Asterisk"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 msgid "GOfon macro"
 msgstr "Macro GOfon"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr "Nom de la macro"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Nom à afficher"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 msgid "Macro content and parameter"
 msgstr "Contenu et paramètre des macros"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr "Etat de visibilité"
 
@@ -876,11 +858,11 @@ msgstr "Etat de visibilité"
 msgid "Macro name to be displayed"
 msgstr "Nom d'affichage de la macro"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "Visible pour l'utilisateur"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "Texte de la macro"
 
@@ -965,16 +947,13 @@ msgid "Voicemail context"
 msgstr "Contexte de la boite vocale"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "Code PIN de la boite vocale"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "Code PIN du téléphone"
 
@@ -986,23 +965,30 @@ msgstr "Rafraîchir"
 msgid "Phone settings"
 msgstr "Configuration du téléphone"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+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"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Ceci fait quelque chose"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatique"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "pas de macros"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "non défini"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
@@ -1010,74 +996,56 @@ msgstr ""
 "Impossible d'identifier l'extension téléphonique dans la base de données, "
 "veuillez essayer de sauver à nouveau."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "Abandon de la sauvegarde des données pour garder la base de données "
 "consistante."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 "GOsa à identifié des problèmes dans les définitions de vos tables MySQL !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr "Veuillez activer le mode debug pour plus de détail !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Supprimer l'extension téléphonique"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Créer un compte téléphone"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 msgid "User uid"
 msgstr "id utilisateur"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr "la macro sélectionnée n'est plus disponible !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Paramètres"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Choisissez votre téléphone privé"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
@@ -1085,38 +1053,31 @@ msgstr ""
 "Il doit y avoir au moins un serveur avec une base de données asterisk pour "
 "créer un compte téléphonique."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr "Entre 1-4 caractères."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, php-format
 msgid "macro parameter %s"
 msgstr "paramètre de la macro %s"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr "Une erreur est survenue lors de la mise à jour de la base de données !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1125,91 +1086,66 @@ msgstr ""
 "Le serveur asterisk primaire précédemment sélectionné n'existe plus (%s). "
 "Effacement interrompu."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 msgid "Phone account settings"
 msgstr "Paramètres compte téléphonique"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Mon Compte"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 msgid "Telephone number"
 msgstr "Numéro de téléphone"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 msgid "Macro settings"
 msgstr "Paramètres des macros"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "Phone context"
 msgstr "Contexte téléphonique"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr "Contexte de la boite vocale"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 msgid "Telephone pin"
 msgstr "Code PIN du téléphone"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr "Code PIN de la boite vocale"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr "Il n'y a pas de serveur asterisk défini !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr "Le serveur Asterisk est non valide !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Le code pin de la boîte vocale doit être long de 4 caractères."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Le code pin de la boîte vocale contient des caractères non valides !"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 msgid "Phone pin contains invalid characters!"
 msgstr "Le mot de passe contient des caractères invalides."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Le paramètre %s contient des caractères invalides. '!#' est utilisé comme "
 "séparateur"
 
-#: gofon/phoneaccount/main.inc:123
-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"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Ceci fait quelque chose"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "conferences"
 msgstr "Conférences"
@@ -1238,57 +1174,57 @@ msgstr "Type"
 msgid "Choose subtree to place conference in"
 msgstr "Sélectionnez la branche où sera enregistrée la conférence"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 msgid "Select language"
 msgstr "Sélectionnez la langue"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Description du département"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "Durée (en jours)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "Code PIN préselectionné"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "Code PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "Enregistrer la conférence"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "Format du fichier son "
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr ""
 "Sélectionnez la branche de l'annuaire dans laquelle sera placée le "
 "département"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "Musique d'attente"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "Activer le menu de session"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "Annoncer les nouveaux utilisateurs et ceux qui quittent"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr "Compter les utilisateurs"
 
@@ -1297,18 +1233,18 @@ msgid "List of conference rooms"
 msgstr "Liste des salles de conférence"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 "Impossible d'effacer l'entrée du serveur '%s' parceque l'entrée semble avoir "
 "déjà été effacée !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
@@ -1316,12 +1252,12 @@ msgstr ""
 "Le serveur asterisk primaire (%s) précédemment sélectionné n'est plus "
 "disponible !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr "Durée"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
@@ -1330,45 +1266,45 @@ msgstr ""
 "GOsa à identifié des problèmes dans les définitions de vos tables MySQL, "
 "veuillez activer le mode debug pour plus de détail."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "'%s' est déjà utilisé par '%s' !"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 msgid "Phone conference management"
 msgstr "Gestion des conférences téléphoniques"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 msgid "GOfon conference"
 msgstr "Conférences téléphoniques"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 msgid "Conference PIN"
 msgstr "Code Pin de la conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 msgid "Activate menu"
 msgstr "Activer le menu"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr "Annoncer l'activité utilisateur"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 msgid "Count user"
 msgstr "Compter les utilisateurs"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 msgid "Conference type"
 msgstr "Type de conférence"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Format"
 msgstr "Format"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "Propriétaire"
 
@@ -1466,6 +1402,12 @@ msgstr "Statut"
 msgid "Search returned no results..."
 msgstr "La recherche n'a renvoyé aucun résultat..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Sélectionnez la branche où sera placée le groupe"
+
+#~ msgid "Select a base"
+#~ msgstr "Sélectionnez une base"
+
 #~ msgid "Update"
 #~ msgstr "Mise à jour"
 
diff --git a/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
index 5334ca132..5d1e464f5 100644
--- a/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +47,7 @@ msgstr ""
 msgid "Down"
 msgstr "Dominio"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Opzioni"
 
@@ -54,20 +55,18 @@ msgstr "Opzioni"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 #, fuzzy
 msgid "Home server"
 msgstr "Server"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Lingua"
 
@@ -198,17 +197,15 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Elimina questo record"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -269,7 +266,7 @@ msgid "Queue length"
 msgstr "Impostazioni FAX"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 #, fuzzy
 msgid "Number"
 msgstr "Nome - Numero"
@@ -282,12 +279,10 @@ msgstr "Data"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -317,32 +312,24 @@ msgstr "Numero di telefono"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -352,42 +339,34 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Telefono"
 
@@ -643,168 +622,152 @@ msgid "Phone name"
 msgstr "Numero di telefono"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Base"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Scegli il subtree dove mettere il gruppo"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-#, fuzzy
-msgid "Select a base"
-msgstr "Rimuovi"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 #, fuzzy
 msgid "phone"
 msgstr "Telefono"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 #, fuzzy
 msgid "yes"
 msgstr "Sistemi"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 #, fuzzy
 msgid "no"
 msgstr "nessuno"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 #, fuzzy
 msgid "Networksettings"
 msgstr "Mostra workstation"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 #, fuzzy
 msgid "IP address"
 msgstr "CAP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Cognome"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Generale"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 #, fuzzy
 msgid "Phone generic"
 msgstr "Numero di telefono"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Dispositivo telefonico"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 msgid "SIP Mode"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 msgid "SIP DTMF mode"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 #, fuzzy
 msgid "SIP Default ip"
 msgstr "Stampante predefinita"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 #, fuzzy
 msgid "IAX authentication type"
 msgstr "Destinazione"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 #, fuzzy
 msgid "IAX secret"
 msgstr "server"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 #, fuzzy
 msgid "IAX account code"
 msgstr "Sicurezza"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 #, fuzzy
 msgid "IAX permit settings"
 msgstr "Impostazioni FAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 #, fuzzy
 msgid "IAX deny settings"
 msgstr "Impostazioni FAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -855,8 +818,7 @@ msgid "Parameter %s is invalid!"
 msgstr "Il valore specificato per l'UID non è valido."
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Informazioni"
 
@@ -866,72 +828,91 @@ msgid ""
 "using it!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, fuzzy, php-format
 msgid "Application missing in line %s!"
 msgstr "applicazioni"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "applicazioni"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 #, fuzzy
 msgid "Macro is still in use!"
 msgstr "Opzioni di posta dell'identità"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 #, fuzzy
 msgid "Macro is empty!"
 msgstr "Nome gruppo"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Riferimenti"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 #, fuzzy
 msgid "GOfon macro"
 msgstr "Rapporti telefono"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 #, fuzzy
 msgid "Macro name"
 msgstr "Nome gruppo"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Mostra il nome"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 #, fuzzy
 msgid "Macro content and parameter"
 msgstr "Nome gruppo"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr ""
 
@@ -939,12 +920,12 @@ msgstr ""
 msgid "Macro name to be displayed"
 msgstr ""
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 #, fuzzy
 msgid "Visible for user"
 msgstr "Lista degli utenti"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 #, fuzzy
 msgid "Macro text"
 msgstr "Nome gruppo"
@@ -1041,16 +1022,13 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Telefono"
@@ -1065,229 +1043,186 @@ msgstr "Riferimenti"
 msgid "Phone settings"
 msgstr "Impostazioni Unix"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+"Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
+"questo dialogo"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Questo fa qualcosa"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatico"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 #, fuzzy
 msgid "no macro"
 msgstr "Rapporti telefono"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 #, fuzzy
 msgid "undefined"
 msgstr "non definito"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Elimina estensioni telefoniche"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Crea estensioni telefoniche"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 #, fuzzy
 msgid "User uid"
 msgstr "elimina"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parametro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Nome gruppo"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Identità"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 #, fuzzy
 msgid "Telephone number"
 msgstr "Numero di telefono"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 #, fuzzy
 msgid "Macro settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 #, fuzzy
 msgid "Phone context"
 msgstr "Telefono"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Telefono"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-"Click sul bottone 'Modifica' qui sotto per cambiare le informazioni in "
-"questo dialogo"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Questo fa qualcosa"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
 msgid "conferences"
@@ -1321,59 +1256,59 @@ msgstr "Tipo"
 msgid "Choose subtree to place conference in"
 msgstr "Scegli il subtree per l'utente"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 #, fuzzy
 msgid "Select language"
 msgstr "Lingua"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr ""
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr ""
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 #, fuzzy
 msgid "Record conference"
 msgstr "Riferimenti"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr ""
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr ""
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr ""
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 #, fuzzy
 msgid "Activate session menu"
 msgstr "Attiva la risposta automatica"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 #, fuzzy
 msgid "Count users"
 msgstr "Paese"
@@ -1384,79 +1319,79 @@ msgid "List of conference rooms"
 msgstr "Lista dei gruppi"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Conferenza"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 #, fuzzy
 msgid "Phone conference management"
 msgstr "Riferimenti"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 #, fuzzy
 msgid "GOfon conference"
 msgstr "Conferenze telefoniche"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 #, fuzzy
 msgid "Conference PIN"
 msgstr "Conferenza"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 #, fuzzy
 msgid "Activate menu"
 msgstr "Attiva la risposta automatica"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 #, fuzzy
 msgid "Count user"
 msgstr "Paese"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 #, fuzzy
 msgid "Conference type"
 msgstr "Riferimenti"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Format"
 msgstr "Informazioni"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr ""
 
@@ -1564,6 +1499,13 @@ msgstr "Stato"
 msgid "Search returned no results..."
 msgstr ""
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Scegli il subtree dove mettere il gruppo"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Rimuovi"
+
 #, fuzzy
 #~ msgid ""
 #~ "This menu allows you to add, edit and remove selected macros. You may "
diff --git a/gosa-plugins/gofon/locale/messages.po b/gosa-plugins/gofon/locale/messages.po
index 2739f34a2..37909c391 100644
--- a/gosa-plugins/gofon/locale/messages.po
+++ b/gosa-plugins/gofon/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgstr ""
 msgid "Down"
 msgstr ""
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr ""
 
@@ -52,19 +53,17 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 msgid "Home server"
 msgstr ""
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr ""
 
@@ -187,16 +186,14 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 msgid "Obsolete entry"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -251,7 +248,7 @@ msgid "Queue length"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 msgid "Number"
 msgstr ""
 
@@ -262,12 +259,10 @@ msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -293,32 +288,24 @@ msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -328,41 +315,33 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 msgid "LDAP error"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr ""
 
@@ -588,154 +567,139 @@ msgid "Phone name"
 msgstr ""
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr ""
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr ""
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr ""
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 msgid "phone"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 msgid "IP address"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 msgid "Phone generic"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 msgid "Phone hardware"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 msgid "SIP Mode"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 msgid "SIP DTMF mode"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 msgid "SIP Default ip"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 msgid "IAX authentication type"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 msgid "IAX secret"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 msgid "IAX account code"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 msgid "IAX permit settings"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 msgid "IAX deny settings"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr ""
 
@@ -781,8 +745,7 @@ msgid "Parameter %s is invalid!"
 msgstr ""
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr ""
 
@@ -792,65 +755,84 @@ msgid ""
 "using it!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, php-format
 msgid "Application missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, php-format
+msgid "Priority missing in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 msgid "Macro is still in use!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 msgid "Macro is empty!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 msgid "Configuration error"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "Asterisk macro management"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 msgid "GOfon macro"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 msgid "Macro content and parameter"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr ""
 
@@ -858,11 +840,11 @@ msgstr ""
 msgid "Macro name to be displayed"
 msgstr ""
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr ""
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr ""
 
@@ -947,16 +929,13 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr ""
 
@@ -968,217 +947,174 @@ msgstr ""
 msgid "Phone settings"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr ""
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr ""
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 msgid "User uid"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, php-format
 msgid "macro parameter %s"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 msgid "Phone account settings"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 msgid "Telephone number"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 msgid "Macro settings"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 msgid "Phone context"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 msgid "Telephone pin"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 msgid "Voicemail PIN contains invalid characters!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 msgid "Phone pin contains invalid characters!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr ""
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr ""
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "conferences"
 msgstr ""
@@ -1207,55 +1143,55 @@ msgstr ""
 msgid "Choose subtree to place conference in"
 msgstr ""
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 msgid "Select language"
 msgstr ""
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr ""
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr ""
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr ""
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr ""
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr ""
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr ""
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr ""
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr ""
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr ""
 
@@ -1264,72 +1200,72 @@ msgid "List of conference rooms"
 msgstr ""
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 msgid "Phone conference management"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 msgid "GOfon conference"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 msgid "Conference PIN"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 msgid "Activate menu"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 msgid "Count user"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 msgid "Conference type"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Format"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr ""
 
diff --git a/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
index b18ba141f..b69761fe1 100644
--- a/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +48,7 @@ msgstr "Omhoog"
 msgid "Down"
 msgstr "Omlaag"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Opties"
 
@@ -55,20 +56,18 @@ msgstr "Opties"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 #, fuzzy
 msgid "Home server"
 msgstr "Tijd Service"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Taal"
 
@@ -191,17 +190,15 @@ msgid "Ring instead of playing background music"
 msgstr "Rinkel i.p.v. achtergrond muziek afspelen"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Verwijder deze invoer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -259,7 +256,7 @@ msgid "Queue length"
 msgstr "Maximale wachtrij lengte"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 #, fuzzy
 msgid "Number"
 msgstr "Naam - nummer"
@@ -272,12 +269,10 @@ msgstr "Plakken"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -307,32 +302,24 @@ msgstr "Telefoonnummer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -342,42 +329,34 @@ msgstr "Fout"
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -627,167 +606,152 @@ msgid "Phone name"
 msgstr "Telefoonnaam"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Basis"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "Selecteer een basis"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 #, fuzzy
 msgid "phone"
 msgstr "Telefoon"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "ja"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "nee"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "dynamisch"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "Netwerk instellingen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 #, fuzzy
 msgid "IP address"
 msgstr "Adres thuis"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Naam"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Algemeen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 #, fuzzy
 msgid "Phone generic"
 msgstr "Telefoonnummer"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Telefoon hardware"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 #, fuzzy
 msgid "SIP Mode"
 msgstr "Modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 #, fuzzy
 msgid "SIP DTMF mode"
 msgstr "DTMF modus"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 #, fuzzy
 msgid "SIP Default ip"
 msgstr "Standaard IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 #, fuzzy
 msgid "IAX authentication type"
 msgstr "Nagios authenticatie"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 #, fuzzy
 msgid "IAX secret"
 msgstr "IMAP Service"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 #, fuzzy
 msgid "IAX account code"
 msgstr "Account code"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 #, fuzzy
 msgid "IAX trunk lines"
 msgstr "Trunk lijnen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 #, fuzzy
 msgid "IAX permit settings"
 msgstr "Fax instellingen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 #, fuzzy
 msgid "IAX deny settings"
 msgstr "Fax instellingen"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -839,8 +803,7 @@ msgid "Parameter %s is invalid!"
 msgstr "De opgegeven naam is ongeldig."
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Informatie"
 
@@ -850,71 +813,90 @@ msgid ""
 "using it!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, fuzzy, php-format
 msgid "Application missing in line %s!"
 msgstr "Er is een dubbele invoer in '%s' voor '%s'"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "Er is een dubbele invoer in '%s' voor '%s'"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 #, fuzzy
 msgid "Macro is still in use!"
 msgstr "E-mail instellingen"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 #, fuzzy
 msgid "Macro is empty!"
 msgstr "Macro tekst"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Asterisk beheer"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 #, fuzzy
 msgid "GOfon macro"
 msgstr "geen macro"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr "Macronaam"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Getoonde naam"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 #, fuzzy
 msgid "Macro content and parameter"
 msgstr "Macro tekst"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr ""
 
@@ -922,11 +904,11 @@ msgstr ""
 msgid "Macro name to be displayed"
 msgstr "Weer te geven macronaam"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "Zichtbaar voor gebruikers"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "Macro tekst"
 
@@ -1017,16 +999,13 @@ msgid "Voicemail context"
 msgstr "Voicemail PIN-code"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "Voicemail PIN-code"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "Telefoon PIN-code"
 
@@ -1038,94 +1017,83 @@ msgstr "Ververs"
 msgid "Phone settings"
 msgstr "Telefoon instellingen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+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"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Dit doet iets"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatisch"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "geen macro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "niet gedefiniëerd"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Verwijder telefoon account"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Telefoon account aanmaken"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 #, fuzzy
 msgid "User uid"
 msgstr "Gebruikers ID"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parameters"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Kies uw privé telefoon"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to create a "
@@ -1134,39 +1102,32 @@ msgstr ""
 "Er moet tenminste een NTP server geselecteerd zijn of de overervings mode "
 "moet geactiveerd zijn."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 #, fuzzy
 msgid "Between 1-4 charactes"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Macro tekst"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Gebruiker '%s' is van telefoonwachtrij '%s' verwijderd"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1175,101 +1136,76 @@ msgstr ""
 "Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
 "profiel wordt op 'geen' ingesteld."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Telefoon instellingen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Mijn account"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 #, fuzzy
 msgid "Telephone number"
 msgstr "Telefoonnummer"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 #, fuzzy
 msgid "Macro settings"
 msgstr "E-mail instellingen"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 #, fuzzy
 msgid "Phone context"
 msgstr "Telefoonnaam"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 #, fuzzy
 msgid "Voice mail context"
 msgstr "Voicemail PIN-code"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Telefoon"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 #, fuzzy
 msgid "Voicemail pin"
 msgstr "Voicemail PIN-code"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Voicemail PIN-code moet tussen 1 en 4 karakters zijn"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "De bevat '%s' bevat ongeldige karakters. '!,#' worden gebruikt als "
 "scheidingstekens"
 
-#: gofon/phoneaccount/main.inc:123
-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"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dit doet iets"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
 msgid "conferences"
@@ -1299,56 +1235,56 @@ msgstr "Type"
 msgid "Choose subtree to place conference in"
 msgstr "Kies de subtree waaronder de conferentie geplaatst wordt"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 #, fuzzy
 msgid "Select language"
 msgstr "Taal"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Omschrijving voor de afdeling"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "Geldigheidsduur (in dagen)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "Voorgedefinieerde PIN-code"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "PIN-code"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "Conferentie opnemen"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "Geluidsbestand formaat"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr "Selecteer de subtree waaronder deze afdeling geplaatst wordt"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "Muziek afspelen bij wachtstand"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "Activeer sessiemenu"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "Kondig binnenkomende en verlatende gebruikers aan"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr "Tel het aantal gebruikers"
 
@@ -1357,81 +1293,81 @@ msgid "List of conference rooms"
 msgstr "Lijst met conferentie kamers"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Conferentie"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 #, fuzzy
 msgid "Lifetime"
 msgstr "Geldigheidsduur (in dagen)"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, fuzzy, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 #, fuzzy
 msgid "Phone conference management"
 msgstr "Conferentie beheer"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 #, fuzzy
 msgid "GOfon conference"
 msgstr "Tel. conferenties"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 #, fuzzy
 msgid "Conference PIN"
 msgstr "Conferentie"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 #, fuzzy
 msgid "Activate menu"
 msgstr "Activeer sessiemenu"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 #, fuzzy
 msgid "Announce user activity"
 msgstr "Aankondigingsfrequentie"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 #, fuzzy
 msgid "Count user"
 msgstr "Tel het aantal gebruikers"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 #, fuzzy
 msgid "Conference type"
 msgstr "Conferentienaam"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Format"
 msgstr "formaat"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "Eigenaar"
 
@@ -1535,6 +1471,12 @@ msgstr "Status"
 msgid "Search returned no results..."
 msgstr "De zoekopdracht gaf geen resultaten terug..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
+
+#~ msgid "Select a base"
+#~ msgstr "Selecteer een basis"
+
 #~ msgid "Submit"
 #~ msgstr "Verwerk"
 
diff --git a/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
index a571b0f23..d457f8d05 100644
--- a/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-09-05 15:32+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,7 +43,7 @@ msgstr "Góra"
 msgid "Down"
 msgstr "W dół"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Opcje"
 
@@ -50,20 +51,18 @@ msgstr "Opcje"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 #, fuzzy
 msgid "Home server"
 msgstr "Serwer czasu"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Język"
 
@@ -186,17 +185,15 @@ msgid "Ring instead of playing background music"
 msgstr "Dzwoń zamiast odtwarzać muzyki w tle"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Usuń ten obiekt"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -254,7 +251,7 @@ msgid "Queue length"
 msgstr "Maksymalna długość kolejki"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 #, fuzzy
 msgid "Number"
 msgstr "Nazwa - Numer"
@@ -266,12 +263,10 @@ msgstr "asterisk"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -298,32 +293,24 @@ msgstr "numer telefonu"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -333,41 +320,33 @@ msgstr "Błąd"
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 msgid "LDAP error"
 msgstr "błąd LDAP"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "Numer telefonu"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Telefon"
 
@@ -596,165 +575,150 @@ msgid "Phone name"
 msgstr "Nazwa telefonu"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Kontener"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Wybierz poddrzewo do umieszczenia grupy"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "Wybierz bazę"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Opis"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 msgid "phone"
 msgstr "telefon"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "tak"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "nie"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "dynamiczne"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "Ustawienia sieci"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 msgid "IP address"
 msgstr "Adres IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Imię"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Ogólne"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 #, fuzzy
 msgid "Phone generic"
 msgstr "Numer telefonu"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 msgid "Phone hardware"
 msgstr "Sprzęt telefoniczny"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 #, fuzzy
 msgid "SIP Mode"
 msgstr "Tryb"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 #, fuzzy
 msgid "SIP DTMF mode"
 msgstr "Tryb DTMF"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 #, fuzzy
 msgid "SIP Default ip"
 msgstr "Domyślny IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 #, fuzzy
 msgid "SIP Qualify"
 msgstr "Kwalifikuj"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 #, fuzzy
 msgid "IAX authentication type"
 msgstr "Autentykacja Nagios"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 #, fuzzy
 msgid "IAX secret"
 msgstr "Usługa FAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 #, fuzzy
 msgid "IAX account code"
 msgstr "Kod konta"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 #, fuzzy
 msgid "IAX trunk lines"
 msgstr "Zmniejsz linie"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 #, fuzzy
 msgid "IAX permit settings"
 msgstr "Ustawienia FAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 #, fuzzy
 msgid "IAX deny settings"
 msgstr "Ustawienia FAX"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr "CAPI MSN"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr "Typ sprzętu"
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -803,8 +767,7 @@ msgid "Parameter %s is invalid!"
 msgstr "Podana nazwa jest nieprawidłowa"
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Informacja"
 
@@ -814,68 +777,87 @@ msgid ""
 "using it!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, fuzzy, php-format
 msgid "Application missing in line %s!"
 msgstr "Istnieje duplikat w '%s' dla '%s'."
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "Istnieje duplikat w '%s' dla '%s'."
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 #, fuzzy
 msgid "Macro is still in use!"
 msgstr "Ustawienia makra"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 msgid "Macro is empty!"
 msgstr "Makro jest puste!"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Plik konfiguracyjny"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 msgid "Asterisk macro management"
 msgstr "Zarządzanie makro Asterisk"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 msgid "GOfon macro"
 msgstr "GOfon makro"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr "Nazwa makra"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Wyświetl nazwę"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 #, fuzzy
 msgid "Macro content and parameter"
 msgstr "Zawartość makro"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr "Flaga widoczności"
 
@@ -883,11 +865,11 @@ msgstr "Flaga widoczności"
 msgid "Macro name to be displayed"
 msgstr "Nazwa makra do wyświetlenia"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "Widoczne dla użytkownika"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "Tekst makro"
 
@@ -977,16 +959,13 @@ msgid "Voicemail context"
 msgstr "PIN poczty głosowej"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "PIN poczty głosowej"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "PIN telefonu"
 
@@ -998,94 +977,81 @@ msgstr "Odśwież"
 msgid "Phone settings"
 msgstr "Ustawienia telefonu"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "To robi coś"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "automatyczne"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "brak makra"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "niezdefiniowany"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Usuń konto telefoniczne"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Utwórz konto telefoniczne"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 #, fuzzy
 msgid "User uid"
 msgstr "Identyfikator użytkownika"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "Parametr"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Wybierz swój telefon prywatny"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 #, fuzzy
 msgid ""
 "There must be at least one server with an asterisk database to create a "
@@ -1094,39 +1060,32 @@ msgstr ""
 "Musi być zaznaczony co najmniej jeden serwer NTP lub zaznaczony tryb "
 "dziedziczenia."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 #, fuzzy
 msgid "Between 1-4 charactes"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Zawartość makro"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "Usunięto użytkownika '%s' z kolejki telefonicznej '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "Podany numer telefonu '%s' jest już przypisany do '%s'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
@@ -1135,93 +1094,70 @@ msgstr ""
 "Wybrany profil kiosk '%s' nie jest już dostępny, ustawiam aktualny profil na "
 "'brak'."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 msgid "Phone account settings"
 msgstr "Ustawienia konta telefonicznego"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Moje konto "
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 msgid "Telephone number"
 msgstr "Numer telefonu"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 msgid "Macro settings"
 msgstr "Ustawienia makra"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 #, fuzzy
 msgid "Phone context"
 msgstr "Nazwa telefonu"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 #, fuzzy
 msgid "Voice mail context"
 msgstr "PIN poczty głosowej"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 msgid "Telephone pin"
 msgstr "PIN Telefonu"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr "PIN poczty głosowej"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "PIN Voicemail musi zawierać od 1 do 4 znaków."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Atrybut hasło jest pusty lub zawiera nieprawidłowe znaki."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 "Parametr %s zawiera nieprawidłowy znak. '!,#' jest użyty jako separator"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Kliknij przycisk 'Edytuj' poniżej, aby zmienić informacje w tym oknie"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "To robi coś"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 msgid "conferences"
 msgstr "konferencje"
@@ -1250,56 +1186,56 @@ msgstr "Typ"
 msgid "Choose subtree to place conference in"
 msgstr "Wybierz poddrzewo do umieszczenia konferencji"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 #, fuzzy
 msgid "Select language"
 msgstr "Język"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Tekst opisujący departament"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "Wiek (w dniach)"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "Prekonfiturowany PIN"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "Nagrywanie konferencji"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "Format pliku dźwiękowego"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr "Wybierz poddrzewo do umieszczenia departamentu"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "Odtwarzaj muzykę podczas zawieszenia"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "Aktywuj menu sesji"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "Zapowiadaj użytkowników dołączających lub opuszczających konferencję"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 msgid "Count users"
 msgstr "Zlicz użytkowników"
 
@@ -1308,73 +1244,73 @@ msgid "List of conference rooms"
 msgstr "Lista sal konferencyjnych"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "Konferencja"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr "Wiek"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, fuzzy, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "Podany numer telefonu '%s' jest już przypisany do '%s'."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 msgid "Phone conference management"
 msgstr "Zarządzanie konferencją telefoniczną"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 #, fuzzy
 msgid "GOfon conference"
 msgstr "Konferencje telefoniczne"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 msgid "Conference PIN"
 msgstr "PIN Konferencji"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 msgid "Activate menu"
 msgstr "Aktywuj menu"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr "Zapowiadaj aktywność użytkownika"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 msgid "Count user"
 msgstr "Zlicz użytkownika"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 msgid "Conference type"
 msgstr "Typ konferencji"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 msgid "Format"
 msgstr "format"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "Właściciel"
 
@@ -1476,6 +1412,12 @@ msgstr "Status"
 msgid "Search returned no results..."
 msgstr "Wyszukiwanie nie zwróciło żadnych wyników..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia grupy"
+
+#~ msgid "Select a base"
+#~ msgstr "Wybierz bazę"
+
 #~ msgid "Update"
 #~ msgstr "Aktualizuj"
 
diff --git a/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
index b86d0e00b..8a0a3050c 100644
--- a/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,7 @@ msgstr ""
 msgid "Down"
 msgstr "Домен"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "Параметры"
 
@@ -53,20 +54,18 @@ msgstr "Параметры"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 #, fuzzy
 msgid "Home server"
 msgstr "Сервисы"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "Язык"
 
@@ -197,17 +196,15 @@ msgid "Ring instead of playing background music"
 msgstr ""
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "Удалить"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -268,7 +265,7 @@ msgid "Queue length"
 msgstr "Настройки Samba"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 #, fuzzy
 msgid "Number"
 msgstr "Номер телефона"
@@ -281,12 +278,10 @@ msgstr "Дата"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -317,32 +312,24 @@ msgstr "Телефонные номера"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -352,43 +339,35 @@ msgstr ""
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 #, fuzzy
 msgid "Phone number"
 msgstr "Телефонные номера"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "Телефон"
 
@@ -646,171 +625,155 @@ msgid "Phone name"
 msgstr "Название"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "Ветка"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "Выберите ветку для группы"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-#, fuzzy
-msgid "Select a base"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "Описание"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 #, fuzzy
 msgid "phone"
 msgstr "Телефон"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 #, fuzzy
 msgid "yes"
 msgstr "Системы"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 #, fuzzy
 msgid "no"
 msgstr "нет"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 #, fuzzy
 msgid "Networksettings"
 msgstr "Сетевые настройки"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 #, fuzzy
 msgid "IP address"
 msgstr "Почтовый индекс"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "Общее"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 #, fuzzy
 msgid "Phone generic"
 msgstr "Телефонные номера"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 #, fuzzy
 msgid "Phone hardware"
 msgstr "Телефонное оборудование"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 #, fuzzy
 msgid "SIP Mode"
 msgstr "Режим"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 #, fuzzy
 msgid "SIP DTMF mode"
 msgstr "Режим"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 #, fuzzy
 msgid "SIP Default ip"
 msgstr "по умолчанию"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 #, fuzzy
 msgid "IAX authentication type"
 msgstr "Рабочая станция Windows"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 #, fuzzy
 msgid "IAX secret"
 msgstr "LDAP-сервер"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 #, fuzzy
 msgid "IAX account code"
 msgstr "Учетная запись"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 #, fuzzy
 msgid "IAX trunk lines"
 msgstr "Тонкие клиенты"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 #, fuzzy
 msgid "IAX permit settings"
 msgstr "Настройки факса"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 #, fuzzy
 msgid "IAX deny settings"
 msgstr "Настройки факса"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -864,8 +827,7 @@ msgid "Parameter %s is invalid!"
 msgstr "Указанное имя уже используется."
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "Информация"
 
@@ -875,72 +837,91 @@ msgid ""
 "using it!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, fuzzy, php-format
 msgid "Application missing in line %s!"
 msgstr "У выбранного приложения нет параметров."
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "У выбранного приложения нет параметров."
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 #, fuzzy
 msgid "Macro is still in use!"
 msgstr "Почтовые настройки пользователя"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 #, fuzzy
 msgid "Macro is empty!"
 msgstr "Название"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Управление системами"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 #, fuzzy
 msgid "GOfon macro"
 msgstr "Телефонные отчеты"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 #, fuzzy
 msgid "Macro name"
 msgstr "Название"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "Отображаемое имя"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 #, fuzzy
 msgid "Macro content and parameter"
 msgstr "Название"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr ""
 
@@ -948,12 +929,12 @@ msgstr ""
 msgid "Macro name to be displayed"
 msgstr ""
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 #, fuzzy
 msgid "Visible for user"
 msgstr "Список пользователей"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 #, fuzzy
 msgid "Macro text"
 msgstr "Название"
@@ -1049,16 +1030,13 @@ msgid "Voicemail context"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr ""
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Телефон"
@@ -1072,228 +1050,185 @@ msgstr "Ссылки"
 msgid "Phone settings"
 msgstr "Настройки телефона"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Что-то будет"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "автоматически"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 #, fuzzy
 msgid "no macro"
 msgstr "Телефонные отчеты"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 #, fuzzy
 msgid "undefined"
 msgstr "не определена"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "Удалить телефонный аккаунт"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "Создать телефонный аккаунт"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 #, fuzzy
 msgid "User uid"
 msgstr "Идентификатор пользователя"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 #, fuzzy
 msgid "Parameter"
 msgstr "Параметры загрузки"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "Укажите личный телефон"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 msgid "Between 1-4 charactes"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "Название"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr "У выбранного приложения нет параметров."
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 #, fuzzy
 msgid "Phone account settings"
 msgstr "Настройки телефона"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 #, fuzzy
 msgid "Telephone number"
 msgstr "Телефонные номера"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 #, fuzzy
 msgid "Macro settings"
 msgstr "Почтовые настройки пользователя"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 #, fuzzy
 msgid "Phone context"
 msgstr "Название"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 msgid "Voice mail context"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 #, fuzzy
 msgid "Telephone pin"
 msgstr "Телефон"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 msgid "Voicemail pin"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "Неправильное указание таймаута '%s'"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Нажмите 'Изменить' чтобы отредактировать данные в этой форме."
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Что-то будет"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
 msgid "conferences"
@@ -1327,59 +1262,59 @@ msgstr "Тип"
 msgid "Choose subtree to place conference in"
 msgstr "Выберите ветку для пользователя"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 #, fuzzy
 msgid "Select language"
 msgstr "Язык"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "Описание подразделения"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 #, fuzzy
 msgid "Preset PIN"
 msgstr "присутствует"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr ""
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 #, fuzzy
 msgid "Record conference"
 msgstr "Ссылки"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr ""
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr "Выберите ветку для подразделения"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr ""
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 #, fuzzy
 msgid "Activate session menu"
 msgstr "Включить автоответчик"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 #, fuzzy
 msgid "Count users"
 msgstr "Страна"
@@ -1390,80 +1325,80 @@ msgid "List of conference rooms"
 msgstr "Список групп"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 #, fuzzy
 msgid "Conference"
 msgstr "Ссылки"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr "У выбранного приложения нет параметров."
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 msgid "Lifetime"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 #, fuzzy
 msgid "Phone conference management"
 msgstr "Управление подразделениями"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 #, fuzzy
 msgid "GOfon conference"
 msgstr "Номер телефона"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 #, fuzzy
 msgid "Conference PIN"
 msgstr "Ссылки"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 #, fuzzy
 msgid "Activate menu"
 msgstr "Включить автоответчик"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 msgid "Announce user activity"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 #, fuzzy
 msgid "Count user"
 msgstr "Страна"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 #, fuzzy
 msgid "Conference type"
 msgstr "Ссылки"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Format"
 msgstr "Порт"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr ""
 
@@ -1567,6 +1502,13 @@ msgstr "Состояние"
 msgid "Search returned no results..."
 msgstr "Не найдено..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "Выберите ветку для группы"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Выберите, чтобы просмотреть серверы"
+
 #, fuzzy
 #~ msgid ""
 #~ "This menu allows you to add, edit and remove selected macros. You may "
diff --git a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
index a5e6c1412..a26ef940d 100644
--- a/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/gofon/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:29+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgstr "上"
 msgid "Down"
 msgstr "关闭"
 
-#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:141
+#: admin/ogroups/gofon/phonequeue.tpl:47 gofon/conference/generic.tpl:135
 msgid "Options"
 msgstr "选项"
 
@@ -52,19 +53,17 @@ msgstr "选项"
 #: admin/ogroups/gofon/class_phonequeue.inc:305
 #: admin/ogroups/gofon/class_phonequeue.inc:929
 #: gofon/phoneaccount/generic.tpl:58
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1413
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1788
-#: gofon/phoneaccount/class_phoneAccount.inc:1413
-#: gofon/phoneaccount/class_phoneAccount.inc:1809
-#: gofon/conference/generic.tpl:68
-#: gofon/conference/class_phoneConferenceGeneric.inc:853
+#: gofon/phoneaccount/class_phoneAccount.inc:1456
+#: gofon/phoneaccount/class_phoneAccount.inc:1852
+#: gofon/conference/generic.tpl:62
+#: gofon/conference/class_phoneConferenceGeneric.inc:828
 msgid "Home server"
 msgstr "主服务器"
 
 #: admin/ogroups/gofon/phonequeue.tpl:62
 #: admin/ogroups/gofon/class_phonequeue.inc:948
-#: gofon/conference/generic.tpl:78
-#: gofon/conference/class_phoneConferenceGeneric.inc:851
+#: gofon/conference/generic.tpl:72
+#: gofon/conference/class_phoneConferenceGeneric.inc:826
 msgid "Language"
 msgstr "语言"
 
@@ -187,17 +186,15 @@ msgid "Ring instead of playing background music"
 msgstr "振铃而非播放背景音乐"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, fuzzy
 msgid "Obsolete entry"
 msgstr "删除这个条目"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:91
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:140
 #: gofon/phoneaccount/class_phoneAccount.inc:140
-#: gofon/conference/class_phoneConferenceGeneric.inc:103
+#: gofon/conference/class_phoneConferenceGeneric.inc:102
 #, php-format
 msgid ""
 "The current home server is not available anymore. It will be moved to '%s' "
@@ -256,7 +253,7 @@ msgid "Queue length"
 msgstr "最大队列长度"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:323
-#: gofon/conference/class_phoneConferenceGeneric.inc:392
+#: gofon/conference/class_phoneConferenceGeneric.inc:368
 #, fuzzy
 msgid "Number"
 msgstr "名称 - 数字"
@@ -269,12 +266,10 @@ msgstr "粘贴"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:378
 #: admin/ogroups/gofon/class_phonequeue.inc:732
-#: gofon/macro/class_gofonMacro.inc:392 gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/conference/class_phoneConferenceGeneric.inc:430
+#: gofon/macro/class_gofonMacro.inc:400 gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/conference/class_phoneConferenceGeneric.inc:406
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
@@ -303,32 +298,24 @@ msgstr "电话号码"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:823
 #: admin/ogroups/gofon/class_phonequeue.inc:865
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458 gofon/macro/class_gofonMacro.inc:467
-#: gofon/macro/class_gofonMacro.inc:505
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:649
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:971
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1211
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1217
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1571
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1581
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1628
-#: gofon/phoneaccount/class_phoneAccount.inc:649
-#: gofon/phoneaccount/class_phoneAccount.inc:971
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1211
-#: gofon/phoneaccount/class_phoneAccount.inc:1217
-#: gofon/phoneaccount/class_phoneAccount.inc:1431
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
-#: gofon/phoneaccount/class_phoneAccount.inc:1592
-#: gofon/phoneaccount/class_phoneAccount.inc:1602
-#: gofon/phoneaccount/class_phoneAccount.inc:1649
-#: gofon/conference/class_phoneConferenceGeneric.inc:260
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
-#: gofon/conference/class_phoneConferenceGeneric.inc:618
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: admin/systems/gofon/class_phoneGeneric.inc:288
+#: gofon/macro/class_gofonMacro.inc:362 gofon/macro/class_gofonMacro.inc:471
+#: gofon/macro/class_gofonMacro.inc:480 gofon/macro/class_gofonMacro.inc:518
+#: gofon/phoneaccount/class_phoneAccount.inc:689
+#: gofon/phoneaccount/class_phoneAccount.inc:1011
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
+#: gofon/phoneaccount/class_phoneAccount.inc:1254
+#: gofon/phoneaccount/class_phoneAccount.inc:1260
+#: gofon/phoneaccount/class_phoneAccount.inc:1474
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
+#: gofon/phoneaccount/class_phoneAccount.inc:1635
+#: gofon/phoneaccount/class_phoneAccount.inc:1645
+#: gofon/phoneaccount/class_phoneAccount.inc:1692
+#: gofon/conference/class_phoneConferenceGeneric.inc:227
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
+#: gofon/conference/class_phoneConferenceGeneric.inc:267
+#: gofon/conference/class_phoneConferenceGeneric.inc:593
 #: gofon/fonreports/class_fonreport.inc:196
 #: gofon/fonreports/class_fonreport.inc:200
 #: gofon/fonreports/class_fonreport.inc:217
@@ -338,42 +325,34 @@ msgstr "错误"
 #: admin/ogroups/gofon/class_phonequeue.inc:838
 #: admin/ogroups/gofon/class_phonequeue.inc:893
 #: admin/systems/services/gofon/class_goFonServer.inc:146
-#: admin/systems/gofon/class_phoneGeneric.inc:282
-#: admin/systems/gofon/class_phoneGeneric.inc:428
-#: admin/systems/gofon/class_phoneGeneric.inc:442
-#: admin/systems/gofon/class_phoneGeneric.inc:459
+#: admin/systems/gofon/class_phoneGeneric.inc:257
+#: admin/systems/gofon/class_phoneGeneric.inc:412
+#: admin/systems/gofon/class_phoneGeneric.inc:426
+#: admin/systems/gofon/class_phoneGeneric.inc:443
 #: gofon/macro/class_gofonMacroParameters.inc:400
-#: gofon/macro/class_gofonMacro.inc:479 gofon/macro/class_gofonMacro.inc:490
-#: gofon/macro/class_gofonMacro.inc:526
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1518
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1689
-#: gofon/phoneaccount/class_phoneAccount.inc:1539
-#: gofon/phoneaccount/class_phoneAccount.inc:1710
-#: gofon/conference/class_phoneConferenceGeneric.inc:789
+#: gofon/macro/class_gofonMacro.inc:492 gofon/macro/class_gofonMacro.inc:503
+#: gofon/macro/class_gofonMacro.inc:540
+#: gofon/phoneaccount/class_phoneAccount.inc:1582
+#: gofon/phoneaccount/class_phoneAccount.inc:1753
+#: gofon/conference/class_phoneConferenceGeneric.inc:764
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:901
-#: gofon/phoneaccount/class_phoneAccount.inc:1457
-#: gofon/conference/generic.tpl:120 gofon/conference/paste_generic.tpl:15
+#: gofon/phoneaccount/class_phoneAccount.inc:1500
+#: gofon/conference/generic.tpl:114 gofon/conference/paste_generic.tpl:15
 msgid "Phone number"
 msgstr "电话号码"
 
 #: admin/ogroups/gofon/class_phonequeue.inc:918
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1047
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1060
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1072
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1079
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1773
 #: gofon/phoneaccount/class_phoneAccount.inc:6
-#: gofon/phoneaccount/class_phoneAccount.inc:1047
-#: gofon/phoneaccount/class_phoneAccount.inc:1060
-#: gofon/phoneaccount/class_phoneAccount.inc:1072
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1079
-#: gofon/phoneaccount/class_phoneAccount.inc:1794
+#: gofon/phoneaccount/class_phoneAccount.inc:1087
+#: gofon/phoneaccount/class_phoneAccount.inc:1100
+#: gofon/phoneaccount/class_phoneAccount.inc:1112
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
+#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1837
 msgid "Phone"
 msgstr "电话"
 
@@ -621,166 +600,151 @@ msgid "Phone name"
 msgstr "电话名称"
 
 #: admin/systems/gofon/phone.tpl:17
-#: admin/systems/gofon/class_phoneGeneric.inc:517
-#: gofon/macro/class_gofonMacro.inc:573 gofon/macro/generic.tpl:27
+#: admin/systems/gofon/class_phoneGeneric.inc:501
+#: gofon/macro/class_gofonMacro.inc:586 gofon/macro/generic.tpl:27
 #: gofon/macro/macro-list.tpl:13 gofon/conference/generic.tpl:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:847
+#: gofon/conference/class_phoneConferenceGeneric.inc:822
 #: gofon/conference/conf-list.tpl:13
 msgid "Base"
 msgstr "位置"
 
-#: admin/systems/gofon/phone.tpl:20 gofon/macro/generic.tpl:30
-msgid "Choose subtree to place group in"
-msgstr "选择来放置组的子树"
-
-#: admin/systems/gofon/phone.tpl:25 gofon/macro/generic.tpl:36
-#: gofon/conference/generic.tpl:56 gofon/conference/generic.tpl:62
-msgid "Select a base"
-msgstr "选择一个位置"
-
-#: admin/systems/gofon/phone.tpl:34
-#: admin/systems/gofon/class_phoneGeneric.inc:518
-#: gofon/macro/class_gofonMacro.inc:574 gofon/macro/generic.tpl:49
-#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:98
+#: admin/systems/gofon/phone.tpl:29
+#: admin/systems/gofon/class_phoneGeneric.inc:502
+#: gofon/macro/class_gofonMacro.inc:587 gofon/macro/generic.tpl:42
+#: gofon/macro/macro-list.xml:49 gofon/conference/generic.tpl:92
 #: gofon/conference/conf-list.xml:49
-#: gofon/conference/class_phoneConferenceGeneric.inc:848
+#: gofon/conference/class_phoneConferenceGeneric.inc:823
 msgid "Description"
 msgstr "描述"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:124
+#: admin/systems/gofon/class_phoneGeneric.inc:131
 #, fuzzy
 msgid "phone"
 msgstr "电话"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "yes"
 msgstr "是"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:235
+#: admin/systems/gofon/class_phoneGeneric.inc:210
 msgid "no"
 msgstr "否"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "dynamic"
 msgstr "动态"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:252
+#: admin/systems/gofon/class_phoneGeneric.inc:227
 msgid "Networksettings"
 msgstr "网络设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:272
-#: gofon/macro/class_gofonMacro.inc:458
+#: admin/systems/gofon/class_phoneGeneric.inc:247
+#: gofon/macro/class_gofonMacro.inc:471
 #, php-format
 msgid "Cannot delete entry because it is still in use by '%s'!"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:331
-#: admin/systems/gofon/class_phoneGeneric.inc:334
+#: admin/systems/gofon/class_phoneGeneric.inc:310
+#: admin/systems/gofon/class_phoneGeneric.inc:313
 #, fuzzy
 msgid "IP address"
 msgstr "地址"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:340
-#: admin/systems/gofon/class_phoneGeneric.inc:344
-#: admin/systems/gofon/class_phoneGeneric.inc:347
-#: admin/systems/gofon/class_phoneGeneric.inc:362
-#: admin/systems/gofon/class_phoneGeneric.inc:516
-#: gofon/macro/class_gofonMacro.inc:406 gofon/macro/class_gofonMacro.inc:412
-#: gofon/macro/macro-list.xml:41 gofon/macro/parameter.tpl:6
-#: gofon/conference/conf-list.xml:41
-#: gofon/conference/class_phoneConferenceGeneric.inc:388
-#: gofon/conference/class_phoneConferenceGeneric.inc:410
-#: gofon/conference/class_phoneConferenceGeneric.inc:846
+#: admin/systems/gofon/class_phoneGeneric.inc:324
+#: admin/systems/gofon/class_phoneGeneric.inc:328
+#: admin/systems/gofon/class_phoneGeneric.inc:331
+#: admin/systems/gofon/class_phoneGeneric.inc:346
+#: admin/systems/gofon/class_phoneGeneric.inc:500
+#: gofon/macro/class_gofonMacro.inc:414 gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/macro-list.xml:41 gofon/macro/macro-filter.tpl:17
+#: gofon/macro/parameter.tpl:6 gofon/conference/conf-list.xml:41
+#: gofon/conference/class_phoneConferenceGeneric.inc:364
+#: gofon/conference/class_phoneConferenceGeneric.inc:386
+#: gofon/conference/class_phoneConferenceGeneric.inc:821
+#: gofon/conference/conf-filter.tpl:17
 msgid "Name"
 msgstr "名称"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:507
-#: gofon/macro/class_gofonMacro.inc:562
+#: admin/systems/gofon/class_phoneGeneric.inc:491
+#: gofon/macro/class_gofonMacro.inc:575
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:508
+#: admin/systems/gofon/class_phoneGeneric.inc:492
 #, fuzzy
 msgid "Phone generic"
 msgstr "电话号码"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:513
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1787
-#: gofon/phoneaccount/class_phoneAccount.inc:1808
+#: admin/systems/gofon/class_phoneGeneric.inc:497
+#: gofon/phoneaccount/class_phoneAccount.inc:1851
 #, fuzzy
 msgid "Phone hardware"
 msgstr "电话硬件"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:519
+#: admin/systems/gofon/class_phoneGeneric.inc:503
 #, fuzzy
 msgid "SIP Mode"
 msgstr "模式"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:520
+#: admin/systems/gofon/class_phoneGeneric.inc:504
 #, fuzzy
 msgid "SIP DTMF mode"
 msgstr "DTMF 模式"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:521
+#: admin/systems/gofon/class_phoneGeneric.inc:505
 #, fuzzy
 msgid "SIP Default ip"
 msgstr "缺省 IP"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:522
+#: admin/systems/gofon/class_phoneGeneric.inc:506
 msgid "SIP Qualify"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:523
+#: admin/systems/gofon/class_phoneGeneric.inc:507
 #, fuzzy
 msgid "IAX authentication type"
 msgstr "Nagios 鉴权"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:524
+#: admin/systems/gofon/class_phoneGeneric.inc:508
 #, fuzzy
 msgid "IAX secret"
 msgstr "IMAP 服务"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:525
+#: admin/systems/gofon/class_phoneGeneric.inc:509
 #, fuzzy
 msgid "IAX account code"
 msgstr "账号号码"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:526
+#: admin/systems/gofon/class_phoneGeneric.inc:510
 msgid "IAX trunk lines"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:527
+#: admin/systems/gofon/class_phoneGeneric.inc:511
 #, fuzzy
 msgid "IAX permit settings"
 msgstr "传真设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:528
+#: admin/systems/gofon/class_phoneGeneric.inc:512
 #, fuzzy
 msgid "IAX deny settings"
 msgstr "传真设置"
 
-#: admin/systems/gofon/class_phoneGeneric.inc:529
+#: admin/systems/gofon/class_phoneGeneric.inc:513
 msgid "CAPI MSN"
 msgstr ""
 
-#: admin/systems/gofon/class_phoneGeneric.inc:530
+#: admin/systems/gofon/class_phoneGeneric.inc:514
 msgid "Hardware type"
 msgstr ""
 
-#: gofon/macro/remove.tpl:2 gofon/phoneaccount/.svn/tmp/tempfile.tmp:328
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:611
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:677
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1561
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1938
-#: gofon/phoneaccount/class_phoneAccount.inc:328
-#: gofon/phoneaccount/class_phoneAccount.inc:342
-#: gofon/phoneaccount/class_phoneAccount.inc:611
-#: gofon/phoneaccount/class_phoneAccount.inc:677
-#: gofon/phoneaccount/class_phoneAccount.inc:1582
-#: gofon/phoneaccount/class_phoneAccount.inc:1959
+#: gofon/macro/remove.tpl:2 gofon/phoneaccount/class_phoneAccount.inc:354
+#: gofon/phoneaccount/class_phoneAccount.inc:368
+#: gofon/phoneaccount/class_phoneAccount.inc:651
+#: gofon/phoneaccount/class_phoneAccount.inc:717
+#: gofon/phoneaccount/class_phoneAccount.inc:1625
+#: gofon/phoneaccount/class_phoneAccount.inc:2002
 #: gofon/conference/remove.tpl:2
-#: gofon/conference/class_phoneConferenceGeneric.inc:463
+#: gofon/conference/class_phoneConferenceGeneric.inc:439
 msgid "Warning"
 msgstr "警告"
 
@@ -826,8 +790,7 @@ msgid "Parameter %s is invalid!"
 msgstr "指定的 branch 名称无效。"
 
 #: gofon/macro/class_gofonMacroParameters.inc:373
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 msgid "Information"
 msgstr "提示信息"
 
@@ -837,71 +800,90 @@ msgid ""
 "using it!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:300
+#: gofon/macro/class_gofonMacro.inc:218
+#, php-format
+msgid ""
+"Macro could not be removed from server '%s', please check database "
+"consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:286
 #, fuzzy, php-format
 msgid "Application missing in line %s!"
 msgstr "没有给出应用程序，在行: '%s'。"
 
-#: gofon/macro/class_gofonMacro.inc:304
+#: gofon/macro/class_gofonMacro.inc:289
+#, fuzzy, php-format
+msgid "Priority missing in line %s!"
+msgstr "没有给出应用程序，在行: '%s'。"
+
+#: gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Extension missing in line %s!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:416
+#: gofon/macro/class_gofonMacro.inc:303
+#, php-format
+msgid "Duplicate combination of 'extension' and 'priority' in line %s!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:336
+#, php-format
+msgid ""
+"Macro could not be added to server '%s', please check database consistency!"
+msgstr ""
+
+#: gofon/macro/class_gofonMacro.inc:429
 msgid "Name can be 20 characters at maximum!"
 msgstr ""
 
-#: gofon/macro/class_gofonMacro.inc:425
+#: gofon/macro/class_gofonMacro.inc:438
 #, fuzzy
 msgid "Macro is still in use!"
 msgstr "邮件选项"
 
-#: gofon/macro/class_gofonMacro.inc:432
+#: gofon/macro/class_gofonMacro.inc:445
 #, fuzzy
 msgid "Macro is empty!"
 msgstr "宏文本"
 
-#: gofon/macro/class_gofonMacro.inc:471
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:431
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:439
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1109
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1647
-#: gofon/phoneaccount/class_phoneAccount.inc:431
-#: gofon/phoneaccount/class_phoneAccount.inc:439
-#: gofon/phoneaccount/class_phoneAccount.inc:1109
-#: gofon/phoneaccount/class_phoneAccount.inc:1668
+#: gofon/macro/class_gofonMacro.inc:484
+#: gofon/phoneaccount/class_phoneAccount.inc:468
+#: gofon/phoneaccount/class_phoneAccount.inc:476
+#: gofon/phoneaccount/class_phoneAccount.inc:1149
+#: gofon/phoneaccount/class_phoneAccount.inc:1711
 #: gofon/fonreports/class_fonreport.inc:176
 #: gofon/fonreports/class_fonreport.inc:179
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
 
-#: gofon/macro/class_gofonMacro.inc:563
+#: gofon/macro/class_gofonMacro.inc:576
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Asterisk 管理"
 
-#: gofon/macro/class_gofonMacro.inc:568
+#: gofon/macro/class_gofonMacro.inc:581
 #, fuzzy
 msgid "GOfon macro"
 msgstr "没有宏"
 
-#: gofon/macro/class_gofonMacro.inc:572 gofon/macro/generic.tpl:6
+#: gofon/macro/class_gofonMacro.inc:585 gofon/macro/generic.tpl:6
 #: gofon/macro/generic.tpl:9 gofon/macro/paste_generic.tpl:4
 #: gofon/macro/paste_generic.tpl:6
 msgid "Macro name"
 msgstr "宏名称"
 
-#: gofon/macro/class_gofonMacro.inc:575 gofon/macro/generic.tpl:14
+#: gofon/macro/class_gofonMacro.inc:588 gofon/macro/generic.tpl:14
 msgid "Display name"
 msgstr "显示名称"
 
-#: gofon/macro/class_gofonMacro.inc:576
+#: gofon/macro/class_gofonMacro.inc:589
 #, fuzzy
 msgid "Macro content and parameter"
 msgstr "启动参数"
 
-#: gofon/macro/class_gofonMacro.inc:577
+#: gofon/macro/class_gofonMacro.inc:590
 msgid "Visibility flag"
 msgstr ""
 
@@ -909,11 +891,11 @@ msgstr ""
 msgid "Macro name to be displayed"
 msgstr "要显示的宏名称"
 
-#: gofon/macro/generic.tpl:60
+#: gofon/macro/generic.tpl:53
 msgid "Visible for user"
 msgstr "用户可见"
 
-#: gofon/macro/generic.tpl:70
+#: gofon/macro/generic.tpl:63
 msgid "Macro text"
 msgstr "宏文本"
 
@@ -1003,16 +985,13 @@ msgid "Voicemail context"
 msgstr "语音邮件 PIN"
 
 #: gofon/phoneaccount/generic.tpl:93 gofon/phoneaccount/paste_generic.tpl:32
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1420
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1420
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
+#: gofon/phoneaccount/class_phoneAccount.inc:1463
 msgid "Voicemail PIN"
 msgstr "语音邮件 PIN"
 
 #: gofon/phoneaccount/generic.tpl:103 gofon/phoneaccount/paste_generic.tpl:40
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1425
-#: gofon/phoneaccount/class_phoneAccount.inc:1425
+#: gofon/phoneaccount/class_phoneAccount.inc:1468
 msgid "Phone PIN"
 msgstr "电话 PIN"
 
@@ -1024,233 +1003,190 @@ msgstr "刷新"
 msgid "Phone settings"
 msgstr "电话设置"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:178
+#: gofon/phoneaccount/main.inc:123
+msgid "Click the 'Edit' button below to change informations in this dialog"
+msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
+
+#: gofon/phoneaccount/class_phoneAccount.inc:7
+#: gofon/fonreports/class_fonreport.inc:7
+#, fuzzy
+msgid "This does something"
+msgstr "******"
+
 #: gofon/phoneaccount/class_phoneAccount.inc:178
 msgid "automatic"
 msgstr "自动"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:214
 #: gofon/phoneaccount/class_phoneAccount.inc:214
 msgid "no macro"
 msgstr "没有宏"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:242
 #: gofon/phoneaccount/class_phoneAccount.inc:242
 msgid "undefined"
 msgstr "未定义"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:342
-#: gofon/phoneaccount/class_phoneAccount.inc:342
+#: gofon/phoneaccount/class_phoneAccount.inc:368
 #, php-format
 msgid ""
 "Cannot identify telephone extension in database, please try to save again."
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:557
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:564
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:582
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:589
-#: gofon/phoneaccount/class_phoneAccount.inc:557
-#: gofon/phoneaccount/class_phoneAccount.inc:564
-#: gofon/phoneaccount/class_phoneAccount.inc:582
-#: gofon/phoneaccount/class_phoneAccount.inc:589
+#: gofon/phoneaccount/class_phoneAccount.inc:597
+#: gofon/phoneaccount/class_phoneAccount.inc:604
+#: gofon/phoneaccount/class_phoneAccount.inc:622
+#: gofon/phoneaccount/class_phoneAccount.inc:629
 #, fuzzy
 msgid "Abort saving entries to keep the database consistent."
 msgstr ""
 "无法查询数据库 '%s' 于 '%s'。取消保存将保持数据库的完整性，通过 GOsa 日志来查"
 "看 mysql 错误。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:612
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:678
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1562
-#: gofon/phoneaccount/class_phoneAccount.inc:612
-#: gofon/phoneaccount/class_phoneAccount.inc:678
-#: gofon/phoneaccount/class_phoneAccount.inc:1583
+#: gofon/phoneaccount/class_phoneAccount.inc:652
+#: gofon/phoneaccount/class_phoneAccount.inc:718
+#: gofon/phoneaccount/class_phoneAccount.inc:1626
 #, php-format
 msgid "GOsa identified problems with your MySQL table definition!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:651
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:973
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1630
-#: gofon/phoneaccount/class_phoneAccount.inc:651
-#: gofon/phoneaccount/class_phoneAccount.inc:973
-#: gofon/phoneaccount/class_phoneAccount.inc:1651
-#: gofon/conference/class_phoneConferenceGeneric.inc:620
+#: gofon/phoneaccount/class_phoneAccount.inc:691
+#: gofon/phoneaccount/class_phoneAccount.inc:1013
+#: gofon/phoneaccount/class_phoneAccount.inc:1694
+#: gofon/conference/class_phoneConferenceGeneric.inc:595
 msgid "Please activate debugging for details!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1071
-#: gofon/phoneaccount/class_phoneAccount.inc:1071
+#: gofon/phoneaccount/class_phoneAccount.inc:1111
 msgid "Remove phone account"
 msgstr "删除电话账号"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1075
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1078
-#: gofon/phoneaccount/class_phoneAccount.inc:1075
-#: gofon/phoneaccount/class_phoneAccount.inc:1078
+#: gofon/phoneaccount/class_phoneAccount.inc:1115
+#: gofon/phoneaccount/class_phoneAccount.inc:1118
 msgid "Create phone account"
 msgstr "创建电话账号"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1076
-#: gofon/phoneaccount/class_phoneAccount.inc:1076
+#: gofon/phoneaccount/class_phoneAccount.inc:1116
 #, fuzzy
 msgid "User uid"
 msgstr "用户 ID"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1094
-#: gofon/phoneaccount/class_phoneAccount.inc:1094
+#: gofon/phoneaccount/class_phoneAccount.inc:1134
 msgid "Selected macro is not available anymore!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1119
-#: gofon/phoneaccount/class_phoneAccount.inc:1119
+#: gofon/phoneaccount/class_phoneAccount.inc:1159
 msgid "Parameter"
 msgstr "参数"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1266
-#: gofon/phoneaccount/class_phoneAccount.inc:1266
+#: gofon/phoneaccount/class_phoneAccount.inc:1309
 msgid "Choose your private phone"
 msgstr "选择您私人电话"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1409
-#: gofon/phoneaccount/class_phoneAccount.inc:1409
+#: gofon/phoneaccount/class_phoneAccount.inc:1452
 msgid ""
 "There must be at least one server with an asterisk database to create a "
 "phone account."
 msgstr "必须有至少一个带有 asterisk 数据库的服务器来创建一个电话账号。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1417
-#: gofon/phoneaccount/class_phoneAccount.inc:1417
+#: gofon/phoneaccount/class_phoneAccount.inc:1460
 #, fuzzy
 msgid "Between 1-4 charactes"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1444
-#: gofon/phoneaccount/class_phoneAccount.inc:1465
+#: gofon/phoneaccount/class_phoneAccount.inc:1508
 #, fuzzy, php-format
 msgid "macro parameter %s"
 msgstr "启动参数"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1492
-#: gofon/phoneaccount/class_phoneAccount.inc:1513
+#: gofon/phoneaccount/class_phoneAccount.inc:1556
 msgid "An error occured while updating the database entries!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1680
-#: gofon/phoneaccount/class_phoneAccount.inc:1701
+#: gofon/phoneaccount/class_phoneAccount.inc:1744
 #, fuzzy, php-format
 msgid "User '%s' has been removed from phone queue '%s'."
 msgstr "删除用户 '%s'，从电话队列 '%s'。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1717
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1719
-#: gofon/phoneaccount/class_phoneAccount.inc:1738
-#: gofon/phoneaccount/class_phoneAccount.inc:1740
+#: gofon/phoneaccount/class_phoneAccount.inc:1781
+#: gofon/phoneaccount/class_phoneAccount.inc:1783
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1765
-#: gofon/phoneaccount/class_phoneAccount.inc:1786
+#: gofon/phoneaccount/class_phoneAccount.inc:1829
 #, php-format
 msgid ""
 "The previously selected asterisk home server (%s) is no longer available. "
 "Remove aborted."
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。删除终止。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1774
-#: gofon/phoneaccount/class_phoneAccount.inc:1795
+#: gofon/phoneaccount/class_phoneAccount.inc:1838
 #, fuzzy
 msgid "Phone account settings"
 msgstr "电话设置"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1778
-#: gofon/phoneaccount/class_phoneAccount.inc:1799
+#: gofon/phoneaccount/class_phoneAccount.inc:1842
 msgid "My account"
 msgstr "我的账号"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1785
-#: gofon/phoneaccount/class_phoneAccount.inc:1806
-#: gofon/conference/class_phoneConferenceGeneric.inc:864
+#: gofon/phoneaccount/class_phoneAccount.inc:1849
+#: gofon/conference/class_phoneConferenceGeneric.inc:839
 #, fuzzy
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1786
-#: gofon/phoneaccount/class_phoneAccount.inc:1807
+#: gofon/phoneaccount/class_phoneAccount.inc:1850
 #, fuzzy
 msgid "Macro settings"
 msgstr "邮件选项"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1789
-#: gofon/phoneaccount/class_phoneAccount.inc:1810
+#: gofon/phoneaccount/class_phoneAccount.inc:1853
 #, fuzzy
 msgid "Phone context"
 msgstr "电话名称"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1790
-#: gofon/phoneaccount/class_phoneAccount.inc:1811
+#: gofon/phoneaccount/class_phoneAccount.inc:1854
 #, fuzzy
 msgid "Voice mail context"
 msgstr "语音邮件 PIN"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1791
-#: gofon/phoneaccount/class_phoneAccount.inc:1812
+#: gofon/phoneaccount/class_phoneAccount.inc:1855
 #, fuzzy
 msgid "Telephone pin"
 msgstr "电话"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1792
-#: gofon/phoneaccount/class_phoneAccount.inc:1813
+#: gofon/phoneaccount/class_phoneAccount.inc:1856
 #, fuzzy
 msgid "Voicemail pin"
 msgstr "语音邮件 PIN"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1874
-#: gofon/phoneaccount/class_phoneAccount.inc:1895
+#: gofon/phoneaccount/class_phoneAccount.inc:1938
 msgid "There is currently no asterisk server defined!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1878
-#: gofon/phoneaccount/class_phoneAccount.inc:1899
+#: gofon/phoneaccount/class_phoneAccount.inc:1942
 msgid "Asterisk server is invalid!"
 msgstr ""
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1884
-#: gofon/phoneaccount/class_phoneAccount.inc:1905
+#: gofon/phoneaccount/class_phoneAccount.inc:1948
 #, fuzzy
 msgid "Voicemail PIN must be 4 characters long!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1887
-#: gofon/phoneaccount/class_phoneAccount.inc:1908
+#: gofon/phoneaccount/class_phoneAccount.inc:1951
 #, fuzzy
 msgid "Voicemail PIN contains invalid characters!"
 msgstr "语音邮件 PIN 必须包含 1-4 个字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1892
-#: gofon/phoneaccount/class_phoneAccount.inc:1913
+#: gofon/phoneaccount/class_phoneAccount.inc:1956
 #, fuzzy
 msgid "Phone pin contains invalid characters!"
 msgstr "属性 '%s' 为空或者包含无效字符。"
 
-#: gofon/phoneaccount/.svn/tmp/tempfile.tmp:1899
-#: gofon/phoneaccount/class_phoneAccount.inc:1920
+#: gofon/phoneaccount/class_phoneAccount.inc:1963
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "参数 %s 包含无效字符。'!,#' 用做分隔符"
 
-#: gofon/phoneaccount/main.inc:123
-msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "点击下面的“编辑”按钮修改该对话框内的信息"
-
-#: gofon/phoneaccount/class_phoneAccount.inc:7
-#: gofon/fonreports/class_fonreport.inc:7
-#, fuzzy
-msgid "This does something"
-msgstr "******"
-
 #: gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
 msgid "conferences"
@@ -1280,56 +1216,56 @@ msgstr "类型"
 msgid "Choose subtree to place conference in"
 msgstr "选择放置会议的子树"
 
-#: gofon/conference/generic.tpl:82
+#: gofon/conference/generic.tpl:76
 #, fuzzy
 msgid "Select language"
 msgstr "服务器名称"
 
-#: gofon/conference/generic.tpl:104
+#: gofon/conference/generic.tpl:98
 msgid "Descriptive text for department"
 msgstr "部门描述文件"
 
-#: gofon/conference/generic.tpl:110
+#: gofon/conference/generic.tpl:104
 msgid "Lifetime (in days)"
 msgstr "生存期（天）"
 
-#: gofon/conference/generic.tpl:157
-#: gofon/conference/class_phoneConferenceGeneric.inc:854
+#: gofon/conference/generic.tpl:151
+#: gofon/conference/class_phoneConferenceGeneric.inc:829
 msgid "Preset PIN"
 msgstr "预置 PIN"
 
-#: gofon/conference/generic.tpl:165
-#: gofon/conference/class_phoneConferenceGeneric.inc:384
+#: gofon/conference/generic.tpl:159
+#: gofon/conference/class_phoneConferenceGeneric.inc:355
 msgid "PIN"
 msgstr "PIN"
 
-#: gofon/conference/generic.tpl:177
-#: gofon/conference/class_phoneConferenceGeneric.inc:855
+#: gofon/conference/generic.tpl:171
+#: gofon/conference/class_phoneConferenceGeneric.inc:830
 msgid "Record conference"
 msgstr "会议记录"
 
-#: gofon/conference/generic.tpl:185
+#: gofon/conference/generic.tpl:179
 msgid "Sound file format"
 msgstr "声音文件类型"
 
-#: gofon/conference/generic.tpl:188
+#: gofon/conference/generic.tpl:182
 msgid "Choose subtree to place department in"
 msgstr "选择放置部门的子树"
 
-#: gofon/conference/generic.tpl:208
-#: gofon/conference/class_phoneConferenceGeneric.inc:856
+#: gofon/conference/generic.tpl:202
+#: gofon/conference/class_phoneConferenceGeneric.inc:831
 msgid "Play music on hold"
 msgstr "播放暂停音乐"
 
-#: gofon/conference/generic.tpl:216
+#: gofon/conference/generic.tpl:210
 msgid "Activate session menu"
 msgstr "激活会话菜单"
 
-#: gofon/conference/generic.tpl:224
+#: gofon/conference/generic.tpl:218
 msgid "Announce users joining or leaving the conference"
 msgstr "通知用户加入或者离开会议"
 
-#: gofon/conference/generic.tpl:232
+#: gofon/conference/generic.tpl:226
 #, fuzzy
 msgid "Count users"
 msgstr "计算机"
@@ -1339,81 +1275,81 @@ msgid "List of conference rooms"
 msgstr "会议室列表"
 
 #: gofon/conference/conf-list.xml:15 gofon/conference/conf-list.xml:74
-#: gofon/conference/class_phoneConferenceGeneric.inc:836
+#: gofon/conference/class_phoneConferenceGeneric.inc:811
 msgid "Conference"
 msgstr "会议"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:264
+#: gofon/conference/class_phoneConferenceGeneric.inc:231
 #, php-format
 msgid "Cannot delete entry from server '%s' because it seems to be removed!"
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:379
+#: gofon/conference/class_phoneConferenceGeneric.inc:350
 #, fuzzy, php-format
 msgid ""
 "The previously selected asterisk home server '%s' is no longer available!"
 msgstr "之前选择的 asterisk 主服务器 (%s) 不存在了。"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:396
-#: gofon/conference/class_phoneConferenceGeneric.inc:863
+#: gofon/conference/class_phoneConferenceGeneric.inc:372
+#: gofon/conference/class_phoneConferenceGeneric.inc:838
 #, fuzzy
 msgid "Lifetime"
 msgstr "生存期（天）"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:464
+#: gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid ""
 "GOsa identified problems with your MySQL table definition, please activate "
 "debugging for details."
 msgstr ""
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:712
-#: gofon/conference/class_phoneConferenceGeneric.inc:714
+#: gofon/conference/class_phoneConferenceGeneric.inc:687
+#: gofon/conference/class_phoneConferenceGeneric.inc:689
 #, fuzzy, php-format
 msgid "'%s' is already assigned to '%s'!"
 msgstr "指定的电话号码 '%s' 已经分配给了 '%s'。"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:837
+#: gofon/conference/class_phoneConferenceGeneric.inc:812
 #, fuzzy
 msgid "Phone conference management"
 msgstr "会议管理"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:842
+#: gofon/conference/class_phoneConferenceGeneric.inc:817
 #, fuzzy
 msgid "GOfon conference"
 msgstr "电话会议"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:849
+#: gofon/conference/class_phoneConferenceGeneric.inc:824
 #, fuzzy
 msgid "Conference PIN"
 msgstr "会议"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:857
+#: gofon/conference/class_phoneConferenceGeneric.inc:832
 #, fuzzy
 msgid "Activate menu"
 msgstr "激活会话菜单"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:858
+#: gofon/conference/class_phoneConferenceGeneric.inc:833
 #, fuzzy
 msgid "Announce user activity"
 msgstr "公告频率"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:859
+#: gofon/conference/class_phoneConferenceGeneric.inc:834
 #, fuzzy
 msgid "Count user"
 msgstr "国家"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:860
+#: gofon/conference/class_phoneConferenceGeneric.inc:835
 #, fuzzy
 msgid "Conference type"
 msgstr "会议名称"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:862
+#: gofon/conference/class_phoneConferenceGeneric.inc:837
 #, fuzzy
 msgid "Format"
 msgstr "格式"
 
-#: gofon/conference/class_phoneConferenceGeneric.inc:865
+#: gofon/conference/class_phoneConferenceGeneric.inc:840
 msgid "Owner"
 msgstr "所有者"
 
@@ -1517,6 +1453,12 @@ msgstr "状态"
 msgid "Search returned no results..."
 msgstr "查无结果..."
 
+#~ msgid "Choose subtree to place group in"
+#~ msgstr "选择来放置组的子树"
+
+#~ msgid "Select a base"
+#~ msgstr "选择一个位置"
+
 #~ msgid "Submit"
 #~ msgstr "提交"
 
diff --git a/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
index 19b5c1fac..2c574a37c 100644
--- a/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-07-22 13:16+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,10 +27,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Warnung"
 
@@ -44,20 +45,20 @@ msgstr ""
 "Systemen ererbt werden."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Allgemein"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Zeit-Server"
@@ -71,7 +72,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Modus"
@@ -84,7 +85,7 @@ msgstr "Wählen Sie den Terminal-Modus"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Syslog-Server"
@@ -96,7 +97,7 @@ msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Root-Server"
@@ -107,7 +108,7 @@ msgstr "Wählen Sie das NFS-Root-Dateisystem"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Auslagerungs-Server"
@@ -155,7 +156,7 @@ msgid "Locked"
 msgstr "Gesperrt"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 msgid "Local swap"
 msgstr "Lokaler Auslagerungsspeicher"
 
@@ -173,7 +174,7 @@ msgstr "Lokaler Auslagerungsspeicher"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -191,43 +192,43 @@ msgstr "Lokaler Auslagerungsspeicher"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr "geerbt"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 msgid "Event error"
 msgstr "Ereignis-Fehler"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "Das Ereignis '%s' ist nicht verfügbar!"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -235,8 +236,8 @@ msgid "Switch off"
 msgstr "Ausschalten"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -256,8 +257,8 @@ msgid "Wake"
 msgstr "Aufwecken"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -265,7 +266,7 @@ msgid "Reinstall"
 msgstr "Neu-Installation"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -288,7 +289,7 @@ msgstr "Systemanalyse"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -306,19 +307,19 @@ msgstr "Systemanalyse"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -331,13 +332,13 @@ msgid "System group"
 msgstr "System-Gruppe"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 msgid "Ntp server"
 msgstr "NTP-Dienst"
 
@@ -378,41 +379,49 @@ msgid "Application settings"
 msgstr "Anwendungs-Einstellungen"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Name"
@@ -517,7 +526,7 @@ msgstr "Nach unten bewegen"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -526,7 +535,7 @@ msgstr "Entfernen"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -572,7 +581,7 @@ msgid "List of devices"
 msgstr "Liste der Geräte"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -581,7 +590,7 @@ msgstr "Gerät"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -594,11 +603,11 @@ msgstr "Gerät"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -632,11 +641,11 @@ msgid "Remove device"
 msgstr "Gerät entfernen"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Geräte"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -644,9 +653,9 @@ msgstr "Geräte"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -724,8 +733,8 @@ msgstr "CD/DVD-Laufwerk"
 msgid "iSerial"
 msgstr "iSerial"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -745,38 +754,38 @@ msgstr "iSerial"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Device generic"
 msgstr "Allgemeines zum Gerät"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Hotplug"
 msgstr "Hotplug"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -788,21 +797,21 @@ msgstr "Hotplug"
 msgid "Type"
 msgstr "Typ"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr "Seriell"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 msgid "Vendor"
 msgstr "Hersteller"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 msgid "Device ID"
 msgstr "Geräte-ID"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Hotplug-Geräte"
@@ -1179,7 +1188,7 @@ msgid "Kiosk profile service"
 msgstr "Kiosk-Profil-Dienst"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1289,7 +1298,7 @@ msgstr "Unterstützte Sitzungstypen"
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr "Freigaben"
@@ -1374,13 +1383,13 @@ msgid "Workstation template"
 msgstr "Vorlage für Arbeitsstation"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "Name der Arbeitsstation"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Ort"
 
@@ -1519,7 +1528,7 @@ msgid "none"
 msgstr "keine"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -1528,8 +1537,8 @@ msgstr "Interner Fehler"
 msgid ""
 "Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
-"Kann keine gültige Abteilung für dieses Objekt ermitteln, setze Basis auf '%"
-"s'."
+"Kann keine gültige Abteilung für dieses Objekt ermitteln, setze Basis auf "
+"'%s'."
 
 #: admin/systems/goto/class_printGeneric.inc:297
 #: admin/systems/goto/class_printGeneric.inc:305
@@ -1603,12 +1612,12 @@ msgstr "Dieser Drucker gehört zu %s. Sie können ihn nicht umbenennen."
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "Arbeitsstation"
@@ -1618,27 +1627,27 @@ msgstr "Arbeitsstation"
 msgid "Object is no printer!"
 msgstr "Das Objekt ist kein Drucker!"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "Drucker URL"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Benutzer"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 msgid "Print generic"
 msgstr "Drucken (Alllgemein)"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1646,41 +1655,41 @@ msgstr "Drucken (Alllgemein)"
 msgid "Printer"
 msgstr "Drucker"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr "Benannte URL"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 msgid "Printer PPD"
 msgstr "Drucker-PPD"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 msgid "printer user"
 msgstr "Druckerbenutzer"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr "Ungültiger Mitgliedstyp '%s'!"
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, php-format
 msgid "'%s' is already used!"
 msgstr "'%s' wird bereits verwendet!"
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, php-format
 msgid "'%s' does not exist!"
 msgstr "'%s' existiert nicht!"
@@ -1700,9 +1709,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 msgid "Mount point"
 msgstr "Einhänge-Pfad"
 
@@ -1790,7 +1799,7 @@ msgid "System informations"
 msgstr "System-Informationen"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1798,8 +1807,8 @@ msgstr "Arbeitsstation"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -1816,7 +1825,7 @@ msgstr "Windows Arbeitsstation"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -2091,56 +2100,56 @@ msgstr "Audio-Dienst"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Softwareupdate"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Erzwinge lokalen Systemstart"
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr "Es fehlt eine gültige LDAP-Server-Zusweisung!"
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 msgid "Software deployment"
 msgstr "Softwareverteilung"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Dieses System installiert momentan. Wenn Sie es speichern möchten, drücken "
 "Sie 'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 msgid "Workstation generic"
 msgstr "Arbeitsstation (Allgemein)"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Goto mode"
 msgstr "GOto-Modus"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 msgid "Root password"
 msgstr "Root-Passwort"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 msgid "Create FAI CD"
 msgstr "FAI CD erstellen"
 
@@ -2206,7 +2215,7 @@ msgstr "Telefon"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Treiber"
 
@@ -2218,7 +2227,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "Auflösung"
@@ -2522,15 +2531,15 @@ msgstr "Zugewiesene FAI-Klassen"
 msgid "set"
 msgstr "setzen"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 msgid "Terminal generic"
 msgstr "Terminal (Allgemein)"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Syslog server enabled"
 msgstr "Protokoll-Server aktiviert"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Ntp server settings"
 msgstr "NTP-Dienst-Einstellungen"
 
@@ -2546,27 +2555,27 @@ msgstr "Druckername"
 msgid "Details"
 msgstr "Details"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr "Drucker-Standort"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr "PPD Anbieter"
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu nutzen"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Benutzer"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr "Benutzer mit Berechtigung, diesen Drucker zu verwalten"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr "Administratoren"
 
@@ -2664,7 +2673,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr "Die temporäre Datei '%s' kann nicht zum Schreiben geöffnet werden."
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 msgid "Parsing PPD file failed - file is empty!"
 msgstr "Das Verarbeiten der PPD-Datei ist fehlgeschlagen - die Datei ist leer!"
 
@@ -2698,7 +2707,7 @@ msgstr "Verschachtelte Werte werden noch nicht unterstützt."
 msgid "PickMany is not supported yet!"
 msgstr "Die Option PickMany wird noch nicht unterstützt!"
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
@@ -2707,7 +2716,7 @@ msgstr ""
 "Das Verarbeiten der PPD-Datei '%s' ist fehlgeschlagen - Zeile zu lang. "
 "Nachfolgende Zeichen wurden ausgelassen."
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -3102,9 +3111,8 @@ msgid "Down"
 msgstr "Ab"
 
 #: addons/goto/deploy-list.xml:225
-#, fuzzy
 msgid "Process now"
-msgstr "Durchgeführt"
+msgstr "Jetzt durchführen"
 
 #: addons/goto/deploy-list.xml:233
 msgid "View logs"
@@ -3348,9 +3356,8 @@ msgid "Show users"
 msgstr "Zeige Benutzer"
 
 #: addons/goto/events/eventTargetSystems-list.xml:11
-#, fuzzy
 msgid "List of target systems"
-msgstr "Liste der Systeme"
+msgstr "Liste der Ziel-Systeme"
 
 #: addons/goto/events/eventTargetSystems-list.xml:89
 msgid "Mac"
@@ -3391,21 +3398,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Import abgeschlossen: %s Vorgänge importiert, %s fehlgeschlagen"
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Umgebung"
 
@@ -3413,26 +3420,26 @@ msgstr "Umgebung"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr "Das Gerät'%s' ist nicht mehr länger verfügbar. Es wird gelöscht!"
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr "auto"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, php-format
 msgid "Cannot open file '%s'!"
 msgstr "Kann Datei '%s' nicht öffnen!"
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
@@ -3441,13 +3448,13 @@ msgstr ""
 "Das Kiosk-Profil '%s', das sich auf dem Server '%s' befindet, ist nicht mehr "
 "verfügbar. Das Kiosk-Profil wird deaktiviert!"
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 "Der Profil-Server '%s' ist nicht mehr verfügbar, Wechsel auf Server '%s'."
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
@@ -3455,98 +3462,98 @@ msgstr ""
 "Der Profil-Server '%s' ist nicht mehr verfügbar. Das Kiosk-Profil wird "
 "deaktiviert."
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr "Anmelde-Skripte"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 msgid "Share"
 msgstr "Freigabe"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 msgid "Used by all users"
 msgstr "Verwendet von allen Benutzern"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr "Verwendet von einigen Benutzern"
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr "Passwort zurücksetzen"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr "Diesen Freigabe-Eintrag entfernen"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr "Kann Standarddrucker-Flag nicht für Gruppen setzen!"
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 msgid "Profile quota"
 msgstr "Profil-Kontingent"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 msgid "environment"
 msgstr "Umgebung"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr "Gruppen-Freigabe"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr "Administrator"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "Standard Drucker"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 msgid "Environment settings"
 msgstr "Umgebungs-Einstellungen"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr "Befehl um die Liste der möglichen Auflösungen zu erweitern"
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 msgid "Profile server"
 msgstr "Profilserver"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr "Profil lokal zwischenspeichern"
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr "Auflösung änderbar während des Betriebs"
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Anmelde-Skript"
diff --git a/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
index c7310ddf6..b92c8b86c 100644
--- a/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 23:42+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,10 +22,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Aviso"
 
@@ -39,20 +40,20 @@ msgstr ""
 "heredados por los clientes asignados a este grupo de objetos."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Genérico"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Servidor NTP"
@@ -65,7 +66,7 @@ msgstr "Elija un servidor que será usado para sincronización horaria"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Modo"
@@ -78,7 +79,7 @@ msgstr "Seleccionar modo de terminal"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Servidor de registro de sistema"
@@ -90,7 +91,7 @@ msgstr "Elija un servidor que será usado para registro"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Servidor Raíz"
@@ -101,7 +102,7 @@ msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
@@ -149,7 +150,7 @@ msgid "Locked"
 msgstr "Bloqueado"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 msgid "Local swap"
 msgstr "Memoria de intercambio local"
 
@@ -167,7 +168,7 @@ msgstr "Memoria de intercambio local"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -185,43 +186,43 @@ msgstr "Memoria de intercambio local"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr "heredado"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Infraestructura de servicio"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 msgid "Event error"
 msgstr "Evento de error"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "¡El evento '%s' no está disponible!"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -229,8 +230,8 @@ msgid "Switch off"
 msgstr "Apagar"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -250,8 +251,8 @@ msgid "Wake"
 msgstr "Despertar"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -259,7 +260,7 @@ msgid "Reinstall"
 msgstr "Reinstalar"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -282,7 +283,7 @@ msgstr "Análisis del sistema"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -300,19 +301,19 @@ msgstr "Análisis del sistema"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -325,13 +326,13 @@ msgid "System group"
 msgstr "Grupos de sistemas"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 msgid "Action flag"
 msgstr "Marca de acción"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 msgid "Ntp server"
 msgstr "Servidor NTP"
 
@@ -372,41 +373,49 @@ msgid "Application settings"
 msgstr "Parametros de la aplicación"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Nombre"
@@ -511,7 +520,7 @@ msgstr "Mover abajo"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -520,7 +529,7 @@ msgstr "Eliminar"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Editar"
@@ -566,7 +575,7 @@ msgid "List of devices"
 msgstr "Lista de dispositivos"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -575,7 +584,7 @@ msgstr "Dispositivo"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -588,11 +597,11 @@ msgstr "Dispositivo"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -626,11 +635,11 @@ msgid "Remove device"
 msgstr "Eliminar dispositivo"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -638,9 +647,9 @@ msgstr "Dispositivos"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -718,8 +727,8 @@ msgstr "Unidad CD/DVD"
 msgid "iSerial"
 msgstr "¡Serie"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -739,38 +748,38 @@ msgstr "¡Serie"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr "Error"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Device generic"
 msgstr "Dispositivo genérico"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Hotplug"
 msgstr "Conexión en caliente (HotPlug)"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -782,21 +791,21 @@ msgstr "Conexión en caliente (HotPlug)"
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr "Serie"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 msgid "Vendor"
 msgstr "Proveedor"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 msgid "Device ID"
 msgstr "ID del Dispositivo"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Dispositivos de conexión en caliente (HotPlug)"
@@ -1173,7 +1182,7 @@ msgid "Kiosk profile service"
 msgstr "Servicio de perfil Kiosk"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1283,7 +1292,7 @@ msgstr "Tipos de sesión soportadas"
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr "Recursos compartidos"
@@ -1367,13 +1376,13 @@ msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "Nombre de la estación de trabajo"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Localización"
 
@@ -1512,7 +1521,7 @@ msgid "none"
 msgstr "ninguno"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -1598,12 +1607,12 @@ msgstr "Esta impresora pertenece a %s. No puede renombrar esta impresora."
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 msgid "terminal"
 msgstr "terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "estación de trabajo"
@@ -1613,27 +1622,27 @@ msgstr "estación de trabajo"
 msgid "Object is no printer!"
 msgstr "¡El objeto no es una impresora!"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "URL de la impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Usuario"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 msgid "Print generic"
 msgstr "Impresora genérica"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1641,41 +1650,41 @@ msgstr "Impresora genérica"
 msgid "Printer"
 msgstr "Impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr "LabeledURL"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 msgid "Printer PPD"
 msgstr "Impresora PPD"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "Permisos"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 msgid "printer user"
 msgstr "usuario de impresora"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr "¡tipo de miembro ilegal '%s'!"
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, php-format
 msgid "'%s' is already used!"
 msgstr "¡'%s' ya esta siendo usado!"
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, php-format
 msgid "'%s' does not exist!"
 msgstr "¡'%s' no existe!"
@@ -1690,14 +1699,14 @@ msgid ""
 "Command '%s', specified as systemKernelsHook for plugin '%s' doesn't seem to "
 "exist."
 msgstr ""
-"El comando '%s', especificado como 'systemKernelsHook' para la extensión '%"
-"s' no existe."
+"El comando '%s', especificado como 'systemKernelsHook' para la extensión "
+"'%s' no existe."
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 msgid "Mount point"
 msgstr "Punto de montaje"
 
@@ -1784,7 +1793,7 @@ msgid "System informations"
 msgstr "Información de sistemas"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1792,8 +1801,8 @@ msgstr "Estación de trabajo"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -1810,7 +1819,7 @@ msgstr "Estaciones de trabajo Windows"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -2085,55 +2094,55 @@ msgstr "Servicio de audio"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Actualización software"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Forzar inicio local"
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Despertar"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr "¡Falta una asignación válida de servidor LDAP!"
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 msgid "Software deployment"
 msgstr "Despliegue de software"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Esta maquina está actualmente instalándose, si quiere grabarla, pulse 'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 msgid "Workstation generic"
 msgstr "Estación de trabajo genérica"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Goto mode"
 msgstr "Pasar al modo"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 msgid "Root password"
 msgstr "Contraseña de root"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 msgid "Create FAI CD"
 msgstr "Crear CD FAI"
 
@@ -2199,7 +2208,7 @@ msgstr "Teléfono"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Controlador"
 
@@ -2211,7 +2220,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "Resolución"
@@ -2513,15 +2522,15 @@ msgstr "Asignar clases FAI"
 msgid "set"
 msgstr "activar"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 msgid "Terminal generic"
 msgstr "Terminal genérico"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Syslog server enabled"
 msgstr "Servidor de registro de sistema activado"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Ntp server settings"
 msgstr "Parámetros del servidor NTP"
 
@@ -2537,27 +2546,27 @@ msgstr "Nombre de la impresora"
 msgid "Details"
 msgstr "Detalles"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr "Localización de la impresora"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr "Proveedor PPD"
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr "Usuarios que tienen permiso para acceder a esta impresora"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Usuarios"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr "Administradores"
 
@@ -2656,7 +2665,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr "El archivo temporal indicado '%s' no puede ser abierto para escritura."
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 msgid "Parsing PPD file failed - file is empty!"
 msgstr "El análisis del archivo PPD 's' ha fallado - ¡el archivo está vacío!"
 
@@ -2690,7 +2699,7 @@ msgstr "¡No se soporta opciones anidadas!"
 msgid "PickMany is not supported yet!"
 msgstr "¡No se soporta selección múltiple!"
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
@@ -2699,7 +2708,7 @@ msgstr ""
 "El análisis del archivo PPD '%s' ha fallado - linea demasiado larga. Los "
 "caracteres sobrantes han sido ignorados"
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -3377,21 +3386,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr "Importación completa: %s eventos han sido enviados, %s han fallado"
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Entorno"
 
@@ -3399,26 +3408,26 @@ msgstr "Entorno"
 msgid "This does something"
 msgstr "Esto hace algo"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr "¡El dispositivo '%s' no está disponible. Será eliminado!"
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr "automático"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, php-format
 msgid "Cannot open file '%s'!"
 msgstr "¡No puedo abrir el fichero '%s'!"
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "desactivado"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
@@ -3427,14 +3436,14 @@ msgstr ""
 "El perfil Kiosk '%s' localizado en el servidor '%s' no está disponible. ¡El "
 "perfil Kiosk sera desactivado!"
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 "El servidor de perfiles '%s' no es accesible. Cambiando el servidor de "
 "perfiles a '%s'."
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
@@ -3442,98 +3451,98 @@ msgstr ""
 "El servidor de perfiles '%s' no es accesible. El perfil Kiosk será "
 "desactivado."
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr "Scripts de inicio de sesión"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 msgid "Share"
 msgstr "Recurso compartido"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 msgid "Used by all users"
 msgstr "Usado por todos los usuarios"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr "Usado por algunos usuarios"
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr "Reiniciar hash de la contraseña"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr "Eliminar entrada compartida"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr "¡No se pueden poner atributos de impresora por defecto a grupos!"
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 msgid "Profile quota"
 msgstr "Cuota del Perfil"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 msgid "environment"
 msgstr "Entorno"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr "grupo compartido"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr "Administrador"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 msgid "Environment settings"
 msgstr "Parámetros de entorno"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr "Comando para extender la lista de resoluciones de pantalla posibles"
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 msgid "Profile server"
 msgstr "Servidor de Perfil"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr "Cachear perfil localmente"
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr "Resolución modificable durante la sesión"
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Script de inicio de sesión"
diff --git a/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
index cd5a7d6dd..3e1a275b4 100644
--- a/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-11-19 17:46+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,10 +18,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -35,20 +36,20 @@ msgstr ""
 "par les clients assigné à ce groupe d'objets."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Informations"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Serveur NTP"
@@ -61,7 +62,7 @@ msgstr "Sélectionnez le serveur pour la synchronisation du temps"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Mode"
@@ -74,7 +75,7 @@ msgstr "Sélectionnez le mode du terminal"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Serveur de journaux systèmes"
@@ -86,7 +87,7 @@ msgstr "Sélectionnez le serveur de journaux à utiliser"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Serveur Primaire"
@@ -97,7 +98,7 @@ msgstr "Sélectionnez le système de fichier racine NFS à utiliser"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Serveur de Swap"
@@ -143,7 +144,7 @@ msgid "Locked"
 msgstr "Verrouillé"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 msgid "Local swap"
 msgstr "swap locale"
 
@@ -161,7 +162,7 @@ msgstr "swap locale"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -179,43 +180,43 @@ msgstr "swap locale"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr "hérité"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr "Infrastructure des services"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 msgid "Event error"
 msgstr "Erreur Evénement "
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "L'événement '%s' n'est pas disponible !"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -223,8 +224,8 @@ msgid "Switch off"
 msgstr "Eteindre"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -244,8 +245,8 @@ msgid "Wake"
 msgstr "Réveiller"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -253,7 +254,7 @@ msgid "Reinstall"
 msgstr "Reinstaller"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -276,7 +277,7 @@ msgstr "Analyse du système"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -294,19 +295,19 @@ msgstr "Analyse du système"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -319,13 +320,13 @@ msgid "System group"
 msgstr "Groupe système"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 msgid "Action flag"
 msgstr "Indicateur d'action"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 msgid "Ntp server"
 msgstr "Serveur NTP"
 
@@ -366,41 +367,49 @@ msgid "Application settings"
 msgstr "Préférences de l'application"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Nom"
@@ -505,7 +514,7 @@ msgstr "En bas"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -514,7 +523,7 @@ msgstr "Supprimer"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Editer"
@@ -561,7 +570,7 @@ msgid "List of devices"
 msgstr "Liste des périphériques"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -570,7 +579,7 @@ msgstr "Périphérique"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -583,11 +592,11 @@ msgstr "Périphérique"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -621,11 +630,11 @@ msgid "Remove device"
 msgstr "Suppression d'un périphérique"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Périphériques"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -633,9 +642,9 @@ msgstr "Périphériques"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -713,8 +722,8 @@ msgstr "Lecteur de CD / DVD"
 msgid "iSerial"
 msgstr "ISérie"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -734,38 +743,38 @@ msgstr "ISérie"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Device generic"
 msgstr "Information du périphérique"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Hotplug"
 msgstr "Enfichable à chaud"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -777,21 +786,21 @@ msgstr "Enfichable à chaud"
 msgid "Type"
 msgstr "Type"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr "Série"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 msgid "Vendor"
 msgstr "Vendeur"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 msgid "Device ID"
 msgstr "ID du périphérique"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Périphériques Hotplug"
@@ -1170,7 +1179,7 @@ msgid "Kiosk profile service"
 msgstr "Service de profil Kiosk"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1280,7 +1289,7 @@ msgstr "Type de sessions supportées"
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr "Partages"
@@ -1295,8 +1304,8 @@ msgstr "Serveur de fichier (Partages)"
 #, php-format
 msgid "Cannot remove share - it is still in use by these objects: %s"
 msgstr ""
-"Impossible d'enlever le partage - il est encore utilisée par ce(s) objets : %"
-"s"
+"Impossible d'enlever le partage - il est encore utilisée par ce(s) objets : "
+"%s"
 
 #: admin/systems/services/shares/class_goShareServer.inc:257
 msgid "share"
@@ -1365,13 +1374,13 @@ msgid "Workstation template"
 msgstr "Modèle de station de travail"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "Nom de la station de travail"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Lieu"
 
@@ -1510,13 +1519,14 @@ msgid "none"
 msgstr "aucun"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "Internal error"
 msgstr "Erreur interne"
 
 #: admin/systems/goto/class_printGeneric.inc:114
 #, php-format
-msgid "Cannot determine a valid department for this object. Setting base to '%s'!"
+msgid ""
+"Cannot determine a valid department for this object. Setting base to '%s'!"
 msgstr ""
 "Impossible d'obtenir un département valide pour cet objet. Je met la base à "
 "'%s' ! "
@@ -1540,7 +1550,8 @@ msgstr ""
 
 #: admin/systems/goto/class_printGeneric.inc:306
 msgid "This is a workstation template, printer tab is disabled."
-msgstr "Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
+msgstr ""
+"Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
 
 #: admin/systems/goto/class_printGeneric.inc:311
 msgid "This is a terminal template, printer tab is disabled."
@@ -1591,12 +1602,12 @@ msgstr "Cette imprimante appartient à %s. Vous ne pouvez pas changer son nom."
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 msgid "terminal"
 msgstr "terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr "stations de travail"
@@ -1606,27 +1617,27 @@ msgstr "stations de travail"
 msgid "Object is no printer!"
 msgstr "L'objet n'est pas une Imprimante !"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "URL de l'imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Groupes"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Utilisateur"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 msgid "Print generic"
 msgstr "Imprimante générique"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1634,41 +1645,41 @@ msgstr "Imprimante générique"
 msgid "Printer"
 msgstr "Imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr "URL de l'imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 msgid "Printer PPD"
 msgstr "PPD de  l'Imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "Permissions"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 msgid "printer user"
 msgstr "utilisateur de l'Imprimante"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr "Type de membre illégal '%s' !"
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, php-format
 msgid "'%s' is already used!"
 msgstr "'%s' est déjà utilisé !"
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, php-format
 msgid "'%s' does not exist!"
 msgstr "'%s' n'existe pas !"
@@ -1688,9 +1699,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 msgid "Mount point"
 msgstr "Point de montage"
 
@@ -1776,7 +1787,7 @@ msgid "System informations"
 msgstr "Information système"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1784,8 +1795,8 @@ msgstr "Stations de travail"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -1802,7 +1813,7 @@ msgstr "Station de travail Windows"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -2077,56 +2088,56 @@ msgstr "Service Son"
 msgid "GUI"
 msgstr "Interface graphique"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr "Mise à jour logicielle"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "Forcer un démarrage local"
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr "Un serveur LDAP valide est manquant !"
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 msgid "Software deployment"
 msgstr "Déploiement logiciel"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 "Cet hôte est en cours d'installation, si vous voulez le sauver, cliquez sur "
 "'OK'."
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 msgid "Workstation generic"
 msgstr "Information de la station de travail"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Goto mode"
 msgstr "Mode Goto"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 msgid "Root password"
 msgstr "Mot de passe root"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 msgid "Create FAI CD"
 msgstr "Créer un CD FAI"
 
@@ -2192,7 +2203,7 @@ msgstr "Téléphone"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Pilote"
 
@@ -2205,7 +2216,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "Résolution"
@@ -2318,11 +2329,13 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:234
 #, php-format
 msgid "FAI mirror '%s' is not available - setting to mirror 'auto'!"
-msgstr "Le miroir FAI '%s' n'est pas disponible - miroir mis sur 'automatique' !"
+msgstr ""
+"Le miroir FAI '%s' n'est pas disponible - miroir mis sur 'automatique' !"
 
 #: admin/systems/goto/class_workstationStartup.inc:247
 #, php-format
-msgid "FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
+msgid ""
+"FAI release '%s' is not available on mirror '%s' - setting to release '%s'!"
 msgstr ""
 "La version FAI '%s' n'est pas disponible sur le miroir '%s' - la version "
 "sera '%s' !"
@@ -2469,7 +2482,8 @@ msgstr "Continuer"
 msgid ""
 "FAI Object assignment disabled. You can't use this feature until FAI is "
 "activated."
-msgstr "Vous ne pouvez pas utiliser cette option tant que FAI n'est pas activé."
+msgstr ""
+"Vous ne pouvez pas utiliser cette option tant que FAI n'est pas activé."
 
 #: admin/systems/goto/workstationStartup.tpl:66
 msgid "GOsa support daemon not configured"
@@ -2501,15 +2515,15 @@ msgstr "Liste des classes FAI utilisées"
 msgid "set"
 msgstr "activé"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 msgid "Terminal generic"
 msgstr "Information du terminal"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Syslog server enabled"
 msgstr "Serveur de journaux systèmes activé"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Ntp server settings"
 msgstr "Préférences du serveur de temps"
 
@@ -2525,27 +2539,27 @@ msgstr "Nom de l'imprimante"
 msgid "Details"
 msgstr "Détails"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr "Localisation de l'imprimante"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr "Fournisseur de PPD"
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr "Utilisateurs qui sont autorisés à utiliser cette imprimante"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr "Utilisateur qui sont autorisés à administrer cette imprimante"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr "Administrateurs"
 
@@ -2644,7 +2658,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr "Le fichier temporaire '%s' n'a pas pu être ouvert en écriture."
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 msgid "Parsing PPD file failed - file is empty!"
 msgstr "La lecture du fichier PPD à échoué - le fichier est vide !"
 
@@ -2678,7 +2692,7 @@ msgstr "Les options imbriquées ne sont pas supportées !"
 msgid "PickMany is not supported yet!"
 msgstr "La sélection multiple n'est pas encore supportée !"
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
@@ -2687,7 +2701,7 @@ msgstr ""
 "La lecture du PPD %s à échoué - ligne trop longue. Les caractères restant on "
 "été ignorés"
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr "La lecture du fichier PPD %s à échoué - pas de données."
@@ -2721,7 +2735,8 @@ msgstr "Impossible de lire le PPD '%s' !"
 #: admin/systems/ppd/class_printerPPDDialog.inc:121
 #, php-format
 msgid "Cannot open PPD path '%s' for reading and writing!"
-msgstr "Impossible de lire et d'écrire dans le chemin spécifié pour le PPD '%s' !"
+msgstr ""
+"Impossible de lire et d'écrire dans le chemin spécifié pour le PPD '%s' !"
 
 #: admin/systems/ppd/class_printerPPDDialog.inc:140
 #: admin/systems/ppd/class_printerPPDDialog.inc:339
@@ -2742,7 +2757,8 @@ msgstr "Ecrasement du PPD existant"
 msgid ""
 "There is already a ppd file for this kind of printer. Do you want to "
 "overwrite it?"
-msgstr "Il y a déjà un fichier ppd pour ce type d'imprimante. Voulez vous l'écraser ?"
+msgstr ""
+"Il y a déjà un fichier ppd pour ce type d'imprimante. Voulez vous l'écraser ?"
 
 #: admin/systems/ppd/class_printerPPDDialog.inc:463
 msgid "Section"
@@ -2942,7 +2958,8 @@ msgstr "Permissions"
 #: addons/goto/class_gotomasses.inc:260
 #, php-format
 msgid "The following jobs couldn't be deleted, they have to be aborted: %s"
-msgstr "Les jobs suivants ne peuvent pas être effacés, il doivent être annulés: %s"
+msgstr ""
+"Les jobs suivants ne peuvent pas être effacés, il doivent être annulés: %s"
 
 #: addons/goto/class_gotomasses.inc:325 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:550
@@ -2966,7 +2983,8 @@ msgstr "Déploiement de système"
 
 #: addons/goto/class_gotomasses.inc:565
 msgid "Provide a mechanism to automatically activate systems"
-msgstr "Procure un mécanisme pour activer un ensemble de systèmes automatiquement"
+msgstr ""
+"Procure un mécanisme pour activer un ensemble de systèmes automatiquement"
 
 #: addons/goto/deploy-list.xml:10
 msgid "List of queued jobs"
@@ -3347,7 +3365,8 @@ msgid "List of users"
 msgstr "Liste des utilisateurs"
 
 #: addons/goto/class_goto_import_file.inc:90
-msgid "Selected entries will be skipped because of errors. Do you want to proceed?"
+msgid ""
+"Selected entries will be skipped because of errors. Do you want to proceed?"
 msgstr ""
 "Les entrées sélectionnées seront ignorées à cause des erreurs qu'elle "
 "contiennent. Voulez vous continuer ?"
@@ -3355,24 +3374,25 @@ msgstr ""
 #: addons/goto/class_goto_import_file.inc:131
 #, php-format
 msgid "Import complete: %s events successfully send, %s failed"
-msgstr "L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
+msgstr ""
+"L'importation est finie : %s évènements ont été envoyés, %s ont échoués"
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Environnement"
 
@@ -3380,26 +3400,26 @@ msgstr "Environnement"
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr "Le périphérique '%s' n'est plus disponible. Il va être supprimé !"
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr "automatique"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, php-format
 msgid "Cannot open file '%s'!"
 msgstr "Impossible de lire le fichier '%s' !"
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "désactivé"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
@@ -3408,114 +3428,115 @@ msgstr ""
 "Le profil Kiosk '%s' situé sur le serveur '%s' n'est plus disponible. Le "
 "profil Kiosk sera désactivé !"
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 "Le serveur de profil '%s' n'est plus disponible. Le serveur de profil est "
 "changé en '%s'."
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, php-format
-msgid "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
+msgid ""
+"Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr ""
 "Le serveur de profil sélectionné '%s' n'est plus disponible. Le profil Kiosk "
 "sera désactivé."
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr "UNIX"
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr "Scripts de démarrage"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 msgid "Share"
 msgstr "Partage"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 msgid "Used by all users"
 msgstr "Utilisé pour tout les utilisateurs"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr "Utilisé par certains utilisateurs"
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr "Réinitialiser le mot de passe"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr "Supprimer ce partage"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 "Impossible de mettre le paramètre par défaut des imprimantes pour les "
 "groupes !"
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 msgid "Profile quota"
 msgstr "Quota du profil"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 msgid "environment"
 msgstr "environnement"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr "partage de groupe"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "Imprimante par défaut"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 msgid "Environment settings"
 msgstr "Préférences d'environnement"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr "Commande pour étendre la liste des résolutions écrans possibles"
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 msgid "Profile server"
 msgstr "Serveur de profil"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr "Cacher le profil localement"
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr "La résolution peut être changée pendant la session"
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Script de démarrage"
@@ -3651,4 +3672,3 @@ msgstr "Dernier script"
 #: personal/environment/logonManagement.tpl:44
 msgid "Script can be replaced by user"
 msgstr "Le script peut être remplacé par l'utilisateur"
-
diff --git a/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
index be545dfe1..83df86b94 100644
--- a/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,10 +19,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Attenzione"
 
@@ -33,20 +34,20 @@ msgid ""
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Generale"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 #, fuzzy
 msgid "NTP server"
@@ -60,7 +61,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 #, fuzzy
 msgid "Mode"
@@ -75,7 +76,7 @@ msgstr "Seleziona un sistema da aggiungere"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 #, fuzzy
 msgid "Syslog server"
@@ -89,7 +90,7 @@ msgstr "Scegli il subtree per l'utente"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 #, fuzzy
 msgid "Root server"
@@ -102,7 +103,7 @@ msgstr "Seleziona un sistema da aggiungere"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 #, fuzzy
 msgid "Swap server"
@@ -153,7 +154,7 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 #, fuzzy
 msgid "Local swap"
 msgstr "Nome locazione"
@@ -172,7 +173,7 @@ msgstr "Nome locazione"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -190,22 +191,22 @@ msgstr "Nome locazione"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -213,22 +214,22 @@ msgid "Service infrastructure"
 msgstr "Seleziona per mostrare le applicazioni"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 #, fuzzy
 msgid "Event error"
 msgstr "Stato"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Cambia la password"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -236,8 +237,8 @@ msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -260,8 +261,8 @@ msgid "Wake"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -269,7 +270,7 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 #, fuzzy
@@ -294,7 +295,7 @@ msgstr "Log di sitema"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -312,19 +313,19 @@ msgstr "Log di sitema"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -340,14 +341,14 @@ msgid "System group"
 msgstr "Accesso ai sistemi"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #, fuzzy
 msgid "Action flag"
 msgstr "Azione"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 #, fuzzy
 msgid "Ntp server"
 msgstr "Servizi"
@@ -396,41 +397,49 @@ msgid "Application settings"
 msgstr "Opzioni applicazione"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Cognome"
@@ -548,7 +557,7 @@ msgstr "Dominio"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -557,7 +566,7 @@ msgstr "Rimuovi"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Modifica"
@@ -606,7 +615,7 @@ msgid "List of devices"
 msgstr "Lista degli utenti"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -616,7 +625,7 @@ msgstr "Dispositivi"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -629,11 +638,11 @@ msgstr "Dispositivi"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -669,11 +678,11 @@ msgid "Remove device"
 msgstr "Elimina foto"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -681,9 +690,9 @@ msgstr "Dispositivi"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -769,8 +778,8 @@ msgstr ""
 msgid "iSerial"
 msgstr "Terminali"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -790,40 +799,40 @@ msgstr "Terminali"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Device generic"
 msgstr "Cognome"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Hotplug"
 msgstr "Dispositivi del client"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -835,24 +844,24 @@ msgstr "Dispositivi del client"
 msgid "Type"
 msgstr "Tipo"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "Terminali"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 #, fuzzy
 msgid "Vendor"
 msgstr "Server"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 #, fuzzy
 msgid "Device ID"
 msgstr "Dispositivi"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 #, fuzzy
 msgid "Hotplug devices"
@@ -1281,7 +1290,7 @@ msgid "Kiosk profile service"
 msgstr "Opzioni di posta dell'identità"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1403,7 +1412,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 #, fuzzy
 msgid "Shares"
@@ -1498,14 +1507,14 @@ msgid "Workstation template"
 msgstr "Messaggio di di risposta automatica"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 #, fuzzy
 msgid "Workstation name"
 msgstr "Mostra workstation"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Località"
 
@@ -1658,7 +1667,7 @@ msgid "none"
 msgstr "nessuno"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -1740,13 +1749,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 #, fuzzy
 msgid "terminal"
 msgstr "Terminali"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1758,28 +1767,28 @@ msgstr "Nome applicazione"
 msgid "Object is no printer!"
 msgstr "Nome dell'oggetto"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "URL della stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 #, fuzzy
 msgid "Print generic"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1787,44 +1796,44 @@ msgstr "Stampante"
 msgid "Printer"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 #, fuzzy
 msgid "Printer PPD"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "Permessi"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 #, fuzzy
 msgid "printer user"
 msgstr "Stampante"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "L'indirizzo principale inserito è già in uso."
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "La password immessa come 'Nuova password' è vuota"
@@ -1843,9 +1852,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 #, fuzzy
 msgid "Mount point"
 msgstr "Monitoraggio"
@@ -1942,7 +1951,7 @@ msgid "System informations"
 msgstr "Informazioni personali"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1950,8 +1959,8 @@ msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 #, fuzzy
 msgid "Terminal"
@@ -1970,7 +1979,7 @@ msgstr "Mostra workstation"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
@@ -2269,8 +2278,8 @@ msgstr "Servizi"
 msgid "GUI"
 msgstr "UID"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
@@ -2278,50 +2287,50 @@ msgstr "UID"
 msgid "Software update"
 msgstr "Crea estensioni telefoniche"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 #, fuzzy
 msgid "Software deployment"
 msgstr "Sistemi"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Mostra workstation"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 #, fuzzy
 msgid "Goto mode"
 msgstr "nella cartella"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 #, fuzzy
 msgid "Root password"
 msgstr "Cambia password"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Creare"
@@ -2394,7 +2403,7 @@ msgstr "Telefono"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Driver"
 
@@ -2405,7 +2414,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr ""
@@ -2721,17 +2730,17 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "set"
 msgstr "reset"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Mostra server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Opzioni di posta dell'identità"
@@ -2748,29 +2757,29 @@ msgstr "Nome della stampante"
 msgid "Details"
 msgstr "Dettagli"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 #, fuzzy
 msgid "Printer location"
 msgstr "Impostazioni Unix"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 #, fuzzy
 msgid "Users which are allowed to use this printer"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Utenti"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 #, fuzzy
 msgid "Admins"
 msgstr "DN dell'amministratore"
@@ -2870,7 +2879,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr ""
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 msgid "Parsing PPD file failed - file is empty!"
 msgstr ""
 
@@ -2902,14 +2911,14 @@ msgstr ""
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -3651,21 +3660,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Ambiente"
 
@@ -3673,148 +3682,148 @@ msgstr "Ambiente"
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 #, fuzzy
 msgid "auto"
 msgstr "Rapporto"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy, php-format
 msgid "Cannot open file '%s'!"
 msgstr "Rimuovi"
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "disabilitato"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
 "profile will be disabled!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr ""
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr ""
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 #, fuzzy
 msgid "Logon scripts"
 msgstr "Utenti di Dominio"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 #, fuzzy
 msgid "Share"
 msgstr "reset"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 #, fuzzy
 msgid "Used by all users"
 msgstr "Utenti di Dominio"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 #, fuzzy
 msgid "Reset password hash"
 msgstr "Cambia password"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 #, fuzzy
 msgid "Delete share entry"
 msgstr "Elimina questo record"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 #, fuzzy
 msgid "Profile quota"
 msgstr "Path del profilo"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 #, fuzzy
 msgid "environment"
 msgstr "Ambiente"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 #, fuzzy
 msgid "group share"
 msgstr "gruppi"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 #, fuzzy
 msgid "Administrator"
 msgstr "Amministrazione"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 #, fuzzy
 msgid "Default printer"
 msgstr "Permessi predefiniti"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 #, fuzzy
 msgid "Environment settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Identità"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 #, fuzzy
 msgid "Profile server"
 msgstr "Server"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 #, fuzzy
 msgid "Logon script"
diff --git a/gosa-plugins/goto/locale/messages.po b/gosa-plugins/goto/locale/messages.po
index b028b1221..0685bbe77 100644
--- a/gosa-plugins/goto/locale/messages.po
+++ b/gosa-plugins/goto/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,10 +20,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr ""
 
@@ -34,20 +35,20 @@ msgid ""
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr ""
@@ -60,7 +61,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr ""
@@ -73,7 +74,7 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr ""
@@ -85,7 +86,7 @@ msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr ""
@@ -96,7 +97,7 @@ msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr ""
@@ -142,7 +143,7 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 msgid "Local swap"
 msgstr ""
 
@@ -160,7 +161,7 @@ msgstr ""
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -178,43 +179,43 @@ msgstr ""
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 msgid "Service infrastructure"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 msgid "Event error"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -222,8 +223,8 @@ msgid "Switch off"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -243,8 +244,8 @@ msgid "Wake"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -252,7 +253,7 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -275,7 +276,7 @@ msgstr ""
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -293,19 +294,19 @@ msgstr ""
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 msgid "LDAP error"
 msgstr ""
 
@@ -318,13 +319,13 @@ msgid "System group"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 msgid "Action flag"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 msgid "Ntp server"
 msgstr ""
 
@@ -365,41 +366,49 @@ msgid "Application settings"
 msgstr ""
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr ""
@@ -504,7 +513,7 @@ msgstr ""
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -513,7 +522,7 @@ msgstr ""
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr ""
@@ -555,7 +564,7 @@ msgid "List of devices"
 msgstr ""
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -564,7 +573,7 @@ msgstr ""
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -577,11 +586,11 @@ msgstr ""
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -615,11 +624,11 @@ msgid "Remove device"
 msgstr ""
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr ""
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -627,9 +636,9 @@ msgstr ""
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -707,8 +716,8 @@ msgstr ""
 msgid "iSerial"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -728,38 +737,38 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Device generic"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 msgid "Hotplug"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -771,21 +780,21 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 msgid "Serial"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 msgid "Vendor"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 msgid "Device ID"
 msgstr ""
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr ""
@@ -1160,7 +1169,7 @@ msgid "Kiosk profile service"
 msgstr ""
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1270,7 +1279,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr ""
@@ -1353,13 +1362,13 @@ msgid "Workstation template"
 msgstr ""
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr ""
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr ""
 
@@ -1494,7 +1503,7 @@ msgid "none"
 msgstr ""
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 msgid "Internal error"
 msgstr ""
 
@@ -1570,12 +1579,12 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 msgid "terminal"
 msgstr ""
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 msgid "workstation"
 msgstr ""
@@ -1585,27 +1594,27 @@ msgstr ""
 msgid "Object is no printer!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 msgid "Print generic"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1613,41 +1622,41 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 msgid "Printer PPD"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 msgid "printer user"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, php-format
 msgid "'%s' is already used!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, php-format
 msgid "'%s' does not exist!"
 msgstr ""
@@ -1665,9 +1674,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 msgid "Mount point"
 msgstr ""
 
@@ -1753,7 +1762,7 @@ msgid "System informations"
 msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1761,8 +1770,8 @@ msgstr ""
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr ""
@@ -1779,7 +1788,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 msgid "Configuration error"
 msgstr ""
 
@@ -2052,54 +2061,54 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
 msgid "Software update"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 msgid "Software deployment"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 msgid "Workstation generic"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 msgid "Goto mode"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 msgid "Root password"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 msgid "Create FAI CD"
 msgstr ""
 
@@ -2165,7 +2174,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr ""
 
@@ -2176,7 +2185,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr ""
@@ -2459,15 +2468,15 @@ msgstr ""
 msgid "set"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 msgid "Terminal generic"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Syslog server enabled"
 msgstr ""
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Ntp server settings"
 msgstr ""
 
@@ -2483,27 +2492,27 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr ""
 
@@ -2595,7 +2604,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr ""
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 msgid "Parsing PPD file failed - file is empty!"
 msgstr ""
 
@@ -2627,14 +2636,14 @@ msgstr ""
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -3300,21 +3309,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr ""
 
@@ -3322,135 +3331,135 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr ""
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, php-format
 msgid "Cannot open file '%s'!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr ""
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
 "profile will be disabled!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr ""
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr ""
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr ""
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 msgid "Share"
 msgstr ""
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 msgid "Used by all users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr ""
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr ""
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 msgid "Profile quota"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 msgid "environment"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 msgid "Environment settings"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 msgid "Profile server"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
diff --git a/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
index b80ec0c84..c52dd0daf 100644
--- a/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,10 +23,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -40,20 +41,20 @@ msgstr ""
 "clients die aan deze objectgroep worden toegekend."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Algemeen"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "NTP tijdserver"
@@ -66,7 +67,7 @@ msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Modus"
@@ -79,7 +80,7 @@ msgstr "Selecteer terminal modus"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Syslog server"
@@ -91,7 +92,7 @@ msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Root server"
@@ -102,7 +103,7 @@ msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Swap server"
@@ -149,7 +150,7 @@ msgid "Locked"
 msgstr "Geblokkeerd"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 #, fuzzy
 msgid "Local swap"
 msgstr "Naam van de locatie"
@@ -168,7 +169,7 @@ msgstr "Naam van de locatie"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -186,22 +187,22 @@ msgstr "Naam van de locatie"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr "overerfd"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -209,22 +210,22 @@ msgid "Service infrastructure"
 msgstr "Zoek binnen subtree"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 #, fuzzy
 msgid "Event error"
 msgstr "Fout"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -232,8 +233,8 @@ msgid "Switch off"
 msgstr "Uitschakelen"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -254,8 +255,8 @@ msgid "Wake"
 msgstr "Aanzetten"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -263,7 +264,7 @@ msgid "Reinstall"
 msgstr "Herinstalleer"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -286,7 +287,7 @@ msgstr "Systeem analyse"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -304,19 +305,19 @@ msgstr "Systeem analyse"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -331,14 +332,14 @@ msgid "System group"
 msgstr "Systeem status"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #, fuzzy
 msgid "Action flag"
 msgstr "Actie"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 #, fuzzy
 msgid "Ntp server"
 msgstr "NTP tijdserver"
@@ -385,41 +386,49 @@ msgid "Application settings"
 msgstr "Programma instellingen"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Naam"
@@ -531,7 +540,7 @@ msgstr "Omlaag verplaatsen"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -540,7 +549,7 @@ msgstr "Verwijderen"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Bewerken"
@@ -592,7 +601,7 @@ msgid "List of devices"
 msgstr "Lijst met apparaten"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -601,7 +610,7 @@ msgstr "Apparaat"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -614,11 +623,11 @@ msgstr "Apparaat"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -654,11 +663,11 @@ msgid "Remove device"
 msgstr "Plaatje verwijderen"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Apparaten"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -666,9 +675,9 @@ msgstr "Apparaten"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -754,8 +763,8 @@ msgstr ""
 msgid "iSerial"
 msgstr "Serieel"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -775,40 +784,40 @@ msgstr "Serieel"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr "Fout"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Device generic"
 msgstr "Servernaam"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Hotplug"
 msgstr "Hotplug apparaten"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -820,24 +829,24 @@ msgstr "Hotplug apparaten"
 msgid "Type"
 msgstr "Type"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "Serieel"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 #, fuzzy
 msgid "Vendor"
 msgstr "Afzender ID"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 #, fuzzy
 msgid "Device ID"
 msgstr "Apparaat"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Hotplug apparaten"
@@ -1252,7 +1261,7 @@ msgid "Kiosk profile service"
 msgstr "Kiosk profiel instellingen"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1371,7 +1380,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr "Shares"
@@ -1460,13 +1469,13 @@ msgid "Workstation template"
 msgstr "Werkstation sjabloon"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "Werkstation naam"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Plaats"
 
@@ -1611,7 +1620,7 @@ msgid "none"
 msgstr "geen"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
@@ -1699,13 +1708,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1717,28 +1726,28 @@ msgstr "Werkstation"
 msgid "Object is no printer!"
 msgstr "Netwerk printer"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "Printer URL"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Groep"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Gebruiker"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 #, fuzzy
 msgid "Print generic"
 msgstr "Print Service"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1746,44 +1755,44 @@ msgstr "Print Service"
 msgid "Printer"
 msgstr "Printer"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 #, fuzzy
 msgid "Printer PPD"
 msgstr "Printer"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "Rechten"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 #, fuzzy
 msgid "printer user"
 msgstr "Printer"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "De opgegeven naam wordt al gebruikt."
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "PPD beheerder : Het opgegeven pad '%s' bestaat niet."
@@ -1803,9 +1812,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 #, fuzzy
 msgid "Mount point"
 msgstr "Koppelpunt"
@@ -1901,7 +1910,7 @@ msgid "System informations"
 msgstr "Systeem informatie"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1909,8 +1918,8 @@ msgstr "Werkstation"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -1927,7 +1936,7 @@ msgstr "Windows werkstation"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -2218,8 +2227,8 @@ msgstr "Audio service"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
@@ -2227,50 +2236,50 @@ msgstr "GUI"
 msgid "Software update"
 msgstr "Onmiddelijk bijwerken"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 #, fuzzy
 msgid "Software deployment"
 msgstr "Systeemtype"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Werkstation naam"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 #, fuzzy
 msgid "Goto mode"
 msgstr "naar map"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 #, fuzzy
 msgid "Root password"
 msgstr "Wachtwoord instellen"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Aanmaken"
@@ -2337,7 +2346,7 @@ msgstr "Telefoon"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Stuurprogramma"
 
@@ -2349,7 +2358,7 @@ msgstr ""
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "Resolutie"
@@ -2663,17 +2672,17 @@ msgstr "Toegekende FAI klasses"
 msgid "set"
 msgstr "stel in"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Terminal Service"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Syslog server"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Gebruikersinstellingen"
@@ -2690,27 +2699,27 @@ msgstr "Printernaam"
 msgid "Details"
 msgstr "Details"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr "Printer locatie"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr "Gebruikers die deze printer mogen gebruiken"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Gebruikers"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr "Gebruikers die deze printer mogen beheren"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr "Beheerders"
 
@@ -2811,7 +2820,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr "Het vereiste tijdelijke bestand '%s' kan niet weggeschreven worden."
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 #, fuzzy
 msgid "Parsing PPD file failed - file is empty!"
 msgstr ""
@@ -2847,7 +2856,7 @@ msgstr "Geneste opties worden niet ondersteund!"
 msgid "PickMany is not supported yet!"
 msgstr "PickMany wordt nog niet ondersteund!"
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
@@ -2856,7 +2865,7 @@ msgstr ""
 "Het parsen van PPD bestand %s is mislukt - regel was te lang. Resterende "
 "karakters zijn genegeerd."
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -3597,21 +3606,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Omgeving"
 
@@ -3619,41 +3628,41 @@ msgstr "Omgeving"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr ""
 "Er is geen MySQL extensie beschikbaar. Controleer uw PHP installatie a.u.b."
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr "auto"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy, php-format
 msgid "Cannot open file '%s'!"
 msgstr "Kan bestand '%s' niet openen."
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
 "profile will be disabled!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, fuzzy, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 "Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
 "profiel wordt op 'geen' ingesteld."
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, fuzzy, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
@@ -3661,104 +3670,104 @@ msgstr ""
 "Het geselecteerde kiosk profiel '%s' is niet meer beschikbaar. Het huidige "
 "profiel wordt op 'geen' ingesteld."
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr ""
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr "Login scripts"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 #, fuzzy
 msgid "Share"
 msgstr "Shares"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 #, fuzzy
 msgid "Used by all users"
 msgstr "Windows gebruikers"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr "Wachtwoord hashwaarde herstellen"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr "Verwijder share regel"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 #, fuzzy
 msgid "Profile quota"
 msgstr "Profiel quota"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 #, fuzzy
 msgid "environment"
 msgstr "Omgeving"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr "groepsshare"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "Standaard printer"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 #, fuzzy
 msgid "Environment settings"
 msgstr "Gebruikersomgeving instellingen"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 #, fuzzy
 msgid "Profile server"
 msgstr "Bestandserver"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr "Profiel lokaal cachen"
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr "Resolutie is binnen de sessie te veranderen"
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Login script"
@@ -5541,8 +5550,8 @@ msgstr "Script kan vervangen worden door gebruiker"
 #, fuzzy
 #~ msgid "Command specified as %s hook for plugin '%s' does not exist!"
 #~ msgstr ""
-#~ "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%"
-#~ "s' bestaat niet."
+#~ "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module "
+#~ "'%s' bestaat niet."
 
 #, fuzzy
 #~ msgid "'%s' command is invalid!"
diff --git a/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
index cf095bab5..c6ec756f9 100644
--- a/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,10 +18,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -35,20 +36,20 @@ msgstr ""
 "klientów przypisanych do tych grup obiektów."
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Ogólne"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Serwer NTP"
@@ -61,7 +62,7 @@ msgstr "Proszę wybrać serwer do synchronizacji czasu"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Tryb"
@@ -74,7 +75,7 @@ msgstr "Proszę wybrać tryb terminala"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Serwer Syslog"
@@ -86,7 +87,7 @@ msgstr "Proszę wybrać serwer do logowania"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Serwer NFS"
@@ -97,7 +98,7 @@ msgstr "Proszę wybrać główny system plików NFS"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Serwer Swap"
@@ -144,7 +145,7 @@ msgid "Locked"
 msgstr "Zablokowane"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 #, fuzzy
 msgid "Local swap"
 msgstr "Nazwa lokalizacji"
@@ -163,7 +164,7 @@ msgstr "Nazwa lokalizacji"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -181,22 +182,22 @@ msgstr "Nazwa lokalizacji"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr "odziedziczony"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -204,22 +205,22 @@ msgid "Service infrastructure"
 msgstr "Szukaj wewnątrz tego poddrzewa"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 #, fuzzy
 msgid "Event error"
 msgstr "Błąd"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Brak uprawnień do zmiay hasła"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -227,8 +228,8 @@ msgid "Switch off"
 msgstr "Wyłącz"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -249,8 +250,8 @@ msgid "Wake"
 msgstr "Zbudź"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -258,7 +259,7 @@ msgid "Reinstall"
 msgstr "Przeinstaluj"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -281,7 +282,7 @@ msgstr "Analiza systemu"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -299,19 +300,19 @@ msgstr "Analiza systemu"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -325,13 +326,13 @@ msgid "System group"
 msgstr "Grupa systemowa"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 msgid "Action flag"
 msgstr "Flaga akcji"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 msgid "Ntp server"
 msgstr "Serwer NTP"
 
@@ -377,41 +378,49 @@ msgid "Application settings"
 msgstr "Ustawienia Aplikacji"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Imię"
@@ -522,7 +531,7 @@ msgstr "Przesuń w dół"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -531,7 +540,7 @@ msgstr "Usuń"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Edytuj"
@@ -581,7 +590,7 @@ msgid "List of devices"
 msgstr "Lista urządzeń"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -590,7 +599,7 @@ msgstr "Urządzenie"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -603,11 +612,11 @@ msgstr "Urządzenie"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -643,11 +652,11 @@ msgid "Remove device"
 msgstr "Usuń obrazek"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Urządzenia"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -655,9 +664,9 @@ msgstr "Urządzenia"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -745,8 +754,8 @@ msgstr ""
 msgid "iSerial"
 msgstr "Szeregowy"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -766,40 +775,40 @@ msgstr "Szeregowy"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Device generic"
 msgstr "Nazwa serwera"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Hotplug"
 msgstr "Urządzenia Hotplug"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -811,24 +820,24 @@ msgstr "Urządzenia Hotplug"
 msgid "Type"
 msgstr "Typ"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "Szeregowy"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 #, fuzzy
 msgid "Vendor"
 msgstr "ID Dostawcy"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 #, fuzzy
 msgid "Device ID"
 msgstr "Urządzenie"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "Urządzenia Hotplug"
@@ -1222,7 +1231,7 @@ msgid "Kiosk profile service"
 msgstr "Ustawienia profilu Kiosk"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1335,7 +1344,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr "Udziały"
@@ -1423,13 +1432,13 @@ msgid "Workstation template"
 msgstr "Szablon stacji roboczej"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "Nazwa stacji roboczej"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Lokalizacja"
 
@@ -1574,7 +1583,7 @@ msgid "none"
 msgstr "żaden"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -1662,13 +1671,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 #, fuzzy
 msgid "terminal"
 msgstr "Terminal"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1680,28 +1689,28 @@ msgstr "Stacja robocza"
 msgid "Object is no printer!"
 msgstr "Drukarka sieciowa"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "URL drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Użytkownik"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 #, fuzzy
 msgid "Print generic"
 msgstr "Usługa drukowania"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1709,43 +1718,43 @@ msgstr "Usługa drukowania"
 msgid "Printer"
 msgstr "Drukarka"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 msgid "Printer PPD"
 msgstr "PPD drukarki"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 #, fuzzy
 msgid "printer user"
 msgstr "Drukarka"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "Ta nazwa jest już w użyciu."
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "Manager PPD: Podana ścieżka '%s' nie istnieje."
@@ -1764,9 +1773,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 #, fuzzy
 msgid "Mount point"
 msgstr "Punkt montowania"
@@ -1859,7 +1868,7 @@ msgid "System informations"
 msgstr "Informacja o systemie"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1867,8 +1876,8 @@ msgstr "Stacja robocza"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "Terminal"
@@ -1885,7 +1894,7 @@ msgstr "Stacja robocza Windows"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy
 msgid "Configuration error"
 msgstr "Plik konfiguracyjny"
@@ -2164,8 +2173,8 @@ msgstr "Usługa dźwięku"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
@@ -2173,50 +2182,50 @@ msgstr "GUI"
 msgid "Software update"
 msgstr "Natychmiastowe uaktualnienie"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Zbudź"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 #, fuzzy
 msgid "Software deployment"
 msgstr "Typ systemu"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Nazwa stacji roboczej"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 #, fuzzy
 msgid "Goto mode"
 msgstr "do folferu"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 #, fuzzy
 msgid "Root password"
 msgstr "Ustaw hasło"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Utwórz"
@@ -2283,7 +2292,7 @@ msgstr "Telefon"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Sterownik"
 
@@ -2294,7 +2303,7 @@ msgstr "Wybierz sterownik wymagany przez zainstalowaną kartę graficzną"
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "Rozdzielczość"
@@ -2606,16 +2615,16 @@ msgstr "Przydzielone klasy FAI"
 msgid "set"
 msgstr "ustaw"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Usługa Terminali"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 msgid "Syslog server enabled"
 msgstr "Serwer Syslog włączony"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 msgid "Ntp server settings"
 msgstr "Ustawienia serwera ntp"
 
@@ -2631,27 +2640,27 @@ msgstr "nazwa drukarki"
 msgid "Details"
 msgstr "Szczegóły"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr "Lokalizacja drukarki"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr "Użytkownicy którzy mogą używać tej drukarki"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr "Użytkownicy, którzy mogą administrować tą drukarką"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr "Administratorzy"
 
@@ -2751,7 +2760,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr "Wymagany plik tymczasowy '%s' nie może zostać otwarty do zapisu."
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 #, fuzzy
 msgid "Parsing PPD file failed - file is empty!"
 msgstr "Parsowanie pliku PPD %s nieudane - nie znaleziono informacji."
@@ -2786,7 +2795,7 @@ msgstr "Opcje zagnieżdżone nie są wspierane!"
 msgid "PickMany is not supported yet!"
 msgstr "PickMany nie jest jeszcze obsługiwany"
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
@@ -2795,7 +2804,7 @@ msgstr ""
 "Parsowanie pliku PPD %s nieudane - linia za długa . Końcowe znaki zostały "
 "zignorowane"
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr "Parsowanie pliku PPD %s nieudane - nie znaleziono informacji."
@@ -3533,21 +3542,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Środowisko"
 
@@ -3555,40 +3564,40 @@ msgstr "Środowisko"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr "Brak snapshot'u który mógłby zostać odtworzony"
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr "automatycznie"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy, php-format
 msgid "Cannot open file '%s'!"
 msgstr "Nie można otworzyć pliku '%s'."
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "wyłączone"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
 "profile will be disabled!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, fuzzy, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 "Wybrany profil kiosk '%s' nie jest już dostępny, ustawiam aktualny profil na "
 "'brak'."
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, fuzzy, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
@@ -3596,101 +3605,101 @@ msgstr ""
 "Wybrany profil kiosk '%s' nie jest już dostępny, ustawiam aktualny profil na "
 "'brak'."
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr "Skrypty logowania"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 #, fuzzy
 msgid "Share"
 msgstr "Udziały"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 #, fuzzy
 msgid "Used by all users"
 msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr "Zresetuj hash hasła"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr "Usuń wpis udziału"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 msgid "Profile quota"
 msgstr "Quota profilu"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 #, fuzzy
 msgid "environment"
 msgstr "Środowisko"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr "grupuj udział"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr "Administrator"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "Domyślna drukarka"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 msgid "Environment settings"
 msgstr "Ustawienia środowiska"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr "Polecenie do rozszerzenia listy możliwych rozdzielczości ekranu"
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 msgid "Profile server"
 msgstr "Serwer profili"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr "Buforu profil lokalnie"
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr "Rozdzielczość zmienialna podczas pracy"
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "Skrypt logowania"
diff --git a/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
index 23c060f29..800edbc3a 100644
--- a/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,10 +18,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -32,20 +33,20 @@ msgid ""
 msgstr ""
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "Общее"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "Сервер NTP"
@@ -58,7 +59,7 @@ msgstr "Выберите сервер для синхронизации врем
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "Режим"
@@ -71,7 +72,7 @@ msgstr "Выберите режим терминала"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "Сервер системных журналов"
@@ -83,7 +84,7 @@ msgstr "Выберите сервер для ведения системных 
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "Основной сервер"
@@ -94,7 +95,7 @@ msgstr "Выберите корневую файловую систему NFS"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "Сервер подкачки"
@@ -142,7 +143,7 @@ msgid "Locked"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 #, fuzzy
 msgid "Local swap"
 msgstr "Местоположение"
@@ -161,7 +162,7 @@ msgstr "Местоположение"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -179,22 +180,22 @@ msgstr "Местоположение"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -202,22 +203,22 @@ msgid "Service infrastructure"
 msgstr "Искать в поддеревьях"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 #, fuzzy
 msgid "Event error"
 msgstr "Состояние системы"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Сменить пароль"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -225,8 +226,8 @@ msgid "Switch off"
 msgstr "Выключить"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -249,8 +250,8 @@ msgid "Wake"
 msgstr "Вернуть в обычный режим"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -258,7 +259,7 @@ msgid "Reinstall"
 msgstr ""
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 #, fuzzy
@@ -284,7 +285,7 @@ msgstr "Системные журналы"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -302,19 +303,19 @@ msgstr "Системные журналы"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -330,14 +331,14 @@ msgid "System group"
 msgstr "Состояние системы"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #, fuzzy
 msgid "Action flag"
 msgstr "Действие"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 #, fuzzy
 msgid "Ntp server"
 msgstr "Сервер NTP"
@@ -386,41 +387,49 @@ msgid "Application settings"
 msgstr "Параметры приложения"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "Фамилия"
@@ -538,7 +547,7 @@ msgstr "Домен"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -547,7 +556,7 @@ msgstr "Удалить"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "Изменить"
@@ -600,7 +609,7 @@ msgid "List of devices"
 msgstr "Список пользователей"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -610,7 +619,7 @@ msgstr "Устройства"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -623,11 +632,11 @@ msgstr "Устройства"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -663,11 +672,11 @@ msgid "Remove device"
 msgstr "Удалить изображение"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "Устройства"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -675,9 +684,9 @@ msgstr "Устройства"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -765,8 +774,8 @@ msgstr ""
 msgid "iSerial"
 msgstr "терминалы"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -786,40 +795,40 @@ msgstr "терминалы"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr ""
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Device generic"
 msgstr "Имя сервера"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Hotplug"
 msgstr "Дисковод"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -831,24 +840,24 @@ msgstr "Дисковод"
 msgid "Type"
 msgstr "Тип"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "терминалы"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 #, fuzzy
 msgid "Vendor"
 msgstr "Идентификатор отправителя"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 #, fuzzy
 msgid "Device ID"
 msgstr "Устройства"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 #, fuzzy
 msgid "Hotplug devices"
@@ -1274,7 +1283,7 @@ msgid "Kiosk profile service"
 msgstr "Почтовые настройки пользователя"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1395,7 +1404,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 #, fuzzy
 msgid "Shares"
@@ -1489,13 +1498,13 @@ msgid "Workstation template"
 msgstr "Шаблон рабочей станции"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "Имя рабочий станции"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "Местоположение"
 
@@ -1648,7 +1657,7 @@ msgid "none"
 msgstr "нет"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "Internal error"
 msgstr "Терминал-сервер"
@@ -1732,13 +1741,13 @@ msgstr ""
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 #, fuzzy
 msgid "terminal"
 msgstr "Терминалы"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1750,28 +1759,28 @@ msgstr "Рабочая станция"
 msgid "Object is no printer!"
 msgstr "Сетевой принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "URL принтера"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "Группа"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "Пользователь"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 #, fuzzy
 msgid "Print generic"
 msgstr "Служба печати"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1779,45 +1788,45 @@ msgstr "Служба печати"
 msgid "Printer"
 msgstr "Принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 #, fuzzy
 msgid "Printer PPD"
 msgstr "Принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 #, fuzzy
 msgid "Permissions"
 msgstr "Права для членов группы"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 #, fuzzy
 msgid "printer user"
 msgstr "Принтер"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "Указанное имя уже используется."
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "Значение поля \"Файлы\" некорректно."
@@ -1837,9 +1846,9 @@ msgstr ""
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 #, fuzzy
 msgid "Mount point"
 msgstr "Мониторинг"
@@ -1933,7 +1942,7 @@ msgid "System informations"
 msgstr "Системная информация"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1941,8 +1950,8 @@ msgstr "Рабочая станция"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 #, fuzzy
 msgid "Terminal"
@@ -1960,7 +1969,7 @@ msgstr "Рабочая станция Windows"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
@@ -2256,8 +2265,8 @@ msgstr "Звук"
 msgid "GUI"
 msgstr "Графический интерфейс"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
@@ -2265,50 +2274,50 @@ msgstr "Графический интерфейс"
 msgid "Software update"
 msgstr "Создать телефонный аккаунт"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 #, fuzzy
 msgid "Software deployment"
 msgstr "Системы"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 #, fuzzy
 msgid "Workstation generic"
 msgstr "Имя рабочий станции"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 #, fuzzy
 msgid "Goto mode"
 msgstr "в папку"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 #, fuzzy
 msgid "Root password"
 msgstr "Изменить пароль"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "Создать"
@@ -2375,7 +2384,7 @@ msgstr "Телефон"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "Драйвер"
 
@@ -2386,7 +2395,7 @@ msgstr "Выберите подходящий драйвер для устано
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "Разрешение"
@@ -2697,17 +2706,17 @@ msgstr "Выберите тип мыши"
 msgid "set"
 msgstr "сброс"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Терминальный сервер"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Сервер системных журналов"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Почтовые настройки пользователя"
@@ -2725,30 +2734,30 @@ msgstr "Имя принтера"
 msgid "Details"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 #, fuzzy
 msgid "Printer location"
 msgstr "Настройки телефона"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 #, fuzzy
 msgid "Users which are allowed to use this printer"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "Пользователи"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 #, fuzzy
 msgid "Users which are allowed to administrate this printer"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 #, fuzzy
 msgid "Admins"
 msgstr "DN администратора"
@@ -2850,7 +2859,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr ""
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 msgid "Parsing PPD file failed - file is empty!"
 msgstr ""
 
@@ -2885,14 +2894,14 @@ msgstr ""
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -3641,21 +3650,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "Окружение"
 
@@ -3663,147 +3672,147 @@ msgstr "Окружение"
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 #, fuzzy
 msgid "auto"
 msgstr "Отношение"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy, php-format
 msgid "Cannot open file '%s'!"
 msgstr "Удалить"
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "отключен"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
 "profile will be disabled!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr ""
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr ""
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr ""
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 #, fuzzy
 msgid "Logon scripts"
 msgstr "Служба печати"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 #, fuzzy
 msgid "Share"
 msgstr "сброс"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 #, fuzzy
 msgid "Used by all users"
 msgstr "Пользователи домена"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 #, fuzzy
 msgid "Reset password hash"
 msgstr "Изменить пароль"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 #, fuzzy
 msgid "Delete share entry"
 msgstr "Удалить"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 #, fuzzy
 msgid "Profile quota"
 msgstr "Путь к профилю"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 #, fuzzy
 msgid "environment"
 msgstr "Окружение"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 #, fuzzy
 msgid "group share"
 msgstr "группы"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 #, fuzzy
 msgid "Administrator"
 msgstr "Администрирование"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "Принтер по умолчанию"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 #, fuzzy
 msgid "Environment settings"
 msgstr "Почтовые настройки пользователя"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 #, fuzzy
 msgid "Profile server"
 msgstr "Сервер для хранения запросов и временных файлов"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 #, fuzzy
 msgid "Logon script"
diff --git a/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
index 2e9128ae1..013484d67 100644
--- a/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/goto/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 15:16+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,10 +20,10 @@ msgstr ""
 #: admin/ogroups/goto/termgroup.tpl:2 admin/devices/remove.tpl:2
 #: admin/applications/remove.tpl:2 admin/mimetypes/remove.tpl:2
 #: admin/systems/ppd/remove_ppd.tpl:2 addons/goto/remove.tpl:2
-#: personal/environment/class_environment.inc:139
-#: personal/environment/class_environment.inc:307
-#: personal/environment/class_environment.inc:360
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:140
+#: personal/environment/class_environment.inc:308
+#: personal/environment/class_environment.inc:361
+#: personal/environment/class_environment.inc:365
 msgid "Warning"
 msgstr "警告"
 
@@ -36,20 +37,20 @@ msgstr ""
 "被分配到该对象组的对象继承。"
 
 #: admin/ogroups/goto/termgroup.tpl:6
-#: admin/devices/class_deviceGeneric.inc:263
+#: admin/devices/class_deviceGeneric.inc:268
 #: admin/applications/class_applicationGeneric.inc:567
 #: admin/mimetypes/generic.tpl:4 admin/mimetypes/paste_generic.tpl:4
 #: admin/mimetypes/class_mimetypeGeneric.inc:683
-#: admin/systems/goto/class_printGeneric.inc:989
-#: admin/systems/goto/class_workstationGeneric.inc:679
+#: admin/systems/goto/class_printGeneric.inc:994
+#: admin/systems/goto/class_workstationGeneric.inc:686
 msgid "Generic"
 msgstr "通用配置"
 
 #: admin/ogroups/goto/termgroup.tpl:14
 #: admin/ogroups/goto/class_termgroup.inc:149
 #: admin/systems/goto/workstation.tpl:90
-#: admin/systems/goto/class_workstationGeneric.inc:470
-#: admin/systems/goto/class_terminalGeneric.inc:462
+#: admin/systems/goto/class_workstationGeneric.inc:477
+#: admin/systems/goto/class_terminalGeneric.inc:469
 #: admin/systems/goto/terminal.tpl:79
 msgid "NTP server"
 msgstr "NTP 服务器"
@@ -62,7 +63,7 @@ msgstr "选择要用于同步时间的服务器"
 #: admin/ogroups/goto/termgroup.tpl:47
 #: admin/ogroups/goto/class_termgroup.inc:390
 #: admin/systems/goto/workstation.tpl:50
-#: admin/systems/goto/class_terminalGeneric.inc:682
+#: admin/systems/goto/class_terminalGeneric.inc:689
 #: admin/systems/goto/terminal.tpl:42
 msgid "Mode"
 msgstr "模式"
@@ -75,7 +76,7 @@ msgstr "选择终端类型"
 #: admin/ogroups/goto/termgroup.tpl:58
 #: admin/ogroups/goto/class_termgroup.inc:391
 #: admin/systems/goto/workstation.tpl:60
-#: admin/systems/goto/class_workstationGeneric.inc:693
+#: admin/systems/goto/class_workstationGeneric.inc:700
 #: admin/systems/goto/terminal.tpl:52
 msgid "Syslog server"
 msgstr "日志服务器"
@@ -87,7 +88,7 @@ msgstr "限制记录日志的服务器"
 
 #: admin/ogroups/goto/termgroup.tpl:69
 #: admin/ogroups/goto/class_termgroup.inc:394
-#: admin/systems/goto/class_terminalGeneric.inc:685
+#: admin/systems/goto/class_terminalGeneric.inc:692
 #: admin/systems/goto/terminal.tpl:112
 msgid "Root server"
 msgstr "根服务器"
@@ -98,7 +99,7 @@ msgstr "选择要用的 NFS 根文件系统。"
 
 #: admin/ogroups/goto/termgroup.tpl:79
 #: admin/ogroups/goto/class_termgroup.inc:395
-#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/class_terminalGeneric.inc:693
 #: admin/systems/goto/terminal.tpl:126
 msgid "Swap server"
 msgstr "交换服务器"
@@ -145,7 +146,7 @@ msgid "Locked"
 msgstr "锁定"
 
 #: admin/ogroups/goto/class_termgroup.inc:99
-#: admin/systems/goto/class_terminalGeneric.inc:259
+#: admin/systems/goto/class_terminalGeneric.inc:261
 #, fuzzy
 msgid "Local swap"
 msgstr "位置名称"
@@ -164,7 +165,7 @@ msgstr "位置名称"
 #: admin/systems/goto/class_terminalService.inc:283
 #: admin/systems/goto/class_terminalService.inc:286
 #: admin/systems/goto/class_terminalService.inc:289
-#: admin/systems/goto/class_workstationGeneric.inc:156
+#: admin/systems/goto/class_workstationGeneric.inc:158
 #: admin/systems/goto/class_workstationStartup.inc:180
 #: admin/systems/goto/class_workstationStartup.inc:210
 #: admin/systems/goto/class_workstationService.inc:197
@@ -182,22 +183,22 @@ msgstr "位置名称"
 #: admin/systems/goto/class_workstationService.inc:233
 #: admin/systems/goto/class_workstationService.inc:234
 #: admin/systems/goto/class_workstationService.inc:235
-#: admin/systems/goto/class_terminalGeneric.inc:140
-#: admin/systems/goto/class_terminalGeneric.inc:265
-#: admin/systems/goto/class_terminalGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:142
+#: admin/systems/goto/class_terminalGeneric.inc:267
+#: admin/systems/goto/class_terminalGeneric.inc:279
 msgid "inherited"
 msgstr "继承"
 
 #: admin/ogroups/goto/class_termgroup.inc:207
 #: admin/systems/goto/class_terminalService.inc:678
-#: admin/systems/goto/class_workstationGeneric.inc:220
-#: admin/systems/goto/class_workstationGeneric.inc:616
+#: admin/systems/goto/class_workstationGeneric.inc:222
+#: admin/systems/goto/class_workstationGeneric.inc:623
 #: admin/systems/goto/class_workstationStartup.inc:938
 #: admin/systems/goto/class_workstationStartup.inc:1066
 #: admin/systems/goto/class_workstationStartup.inc:1127
 #: admin/systems/goto/class_workstationService.inc:572
-#: admin/systems/goto/class_terminalGeneric.inc:196
-#: admin/systems/goto/class_terminalGeneric.inc:607
+#: admin/systems/goto/class_terminalGeneric.inc:198
+#: admin/systems/goto/class_terminalGeneric.inc:614
 #: addons/goto/class_gotomasses.inc:382
 #: addons/goto/class_goto_import_file.inc:124
 #, fuzzy
@@ -205,22 +206,22 @@ msgid "Service infrastructure"
 msgstr "在子树中查找"
 
 #: admin/ogroups/goto/class_termgroup.inc:211
-#: admin/systems/goto/class_workstationGeneric.inc:224
-#: admin/systems/goto/class_terminalGeneric.inc:200
+#: admin/systems/goto/class_workstationGeneric.inc:226
+#: admin/systems/goto/class_terminalGeneric.inc:202
 #, fuzzy
 msgid "Event error"
 msgstr "错误"
 
 #: admin/ogroups/goto/class_termgroup.inc:212
-#: admin/systems/goto/class_workstationGeneric.inc:225
-#: admin/systems/goto/class_terminalGeneric.inc:201
+#: admin/systems/goto/class_workstationGeneric.inc:227
+#: admin/systems/goto/class_terminalGeneric.inc:203
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "不允许修改口令"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:243
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:245
 #: addons/goto/deploy-list.xml:84
 #: addons/goto/events/class_DaemonEvent_halt.inc:31
 #: addons/goto/events/class_DaemonEvent_halt.inc:32
@@ -228,8 +229,8 @@ msgid "Switch off"
 msgstr "关闭"
 
 #: admin/ogroups/goto/class_termgroup.inc:261
-#: admin/systems/goto/class_workstationGeneric.inc:275
-#: admin/systems/goto/class_terminalGeneric.inc:244
+#: admin/systems/goto/class_workstationGeneric.inc:277
+#: admin/systems/goto/class_terminalGeneric.inc:246
 #: addons/goto/deploy-list.xml:91
 #: addons/goto/events/class_DaemonEvent_reboot.inc:29
 #: addons/goto/events/class_DaemonEvent_reboot.inc:30
@@ -250,8 +251,8 @@ msgid "Wake"
 msgstr "唤醒"
 
 #: admin/ogroups/goto/class_termgroup.inc:265
-#: admin/systems/goto/class_workstationGeneric.inc:277
-#: admin/systems/goto/class_workstationGeneric.inc:285
+#: admin/systems/goto/class_workstationGeneric.inc:279
+#: admin/systems/goto/class_workstationGeneric.inc:287
 #: addons/goto/deploy-list.xml:126
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:32
 #: addons/goto/events/class_DaemonEvent_reinstall.inc:33
@@ -259,7 +260,7 @@ msgid "Reinstall"
 msgstr "重新安装"
 
 #: admin/ogroups/goto/class_termgroup.inc:266
-#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:280
 #: addons/goto/events/class_DaemonEvent_rescan.inc:28
 #: addons/goto/events/class_DaemonEvent_rescan.inc:29
 msgid "Rescan hardware"
@@ -282,7 +283,7 @@ msgstr "系统分析"
 #: admin/groups/apps/class_groupApplication.inc:1330
 #: admin/groups/apps/class_groupApplication.inc:1344
 #: admin/groups/apps/class_groupApplication.inc:1358
-#: admin/devices/class_deviceGeneric.inc:208
+#: admin/devices/class_deviceGeneric.inc:213
 #: admin/applications/class_applicationParameters.inc:158
 #: admin/applications/class_applicationParameters.inc:221
 #: admin/applications/class_applicationGeneric.inc:241
@@ -300,19 +301,19 @@ msgstr "系统分析"
 #: admin/systems/services/shares/class_goShareServer.inc:301
 #: admin/systems/services/shares/class_goShareServer.inc:314
 #: admin/systems/goto/class_printGeneric.inc:657
-#: admin/systems/goto/class_printGeneric.inc:954
+#: admin/systems/goto/class_printGeneric.inc:959
 #: admin/systems/goto/class_terminalStartup.inc:426
 #: admin/systems/goto/class_ArpNewDevice.inc:126
 #: admin/systems/goto/class_terminalService.inc:597
-#: admin/systems/goto/class_workstationGeneric.inc:342
-#: admin/systems/goto/class_workstationGeneric.inc:577
-#: admin/systems/goto/class_workstationGeneric.inc:594
+#: admin/systems/goto/class_workstationGeneric.inc:344
+#: admin/systems/goto/class_workstationGeneric.inc:584
+#: admin/systems/goto/class_workstationGeneric.inc:601
 #: admin/systems/goto/class_workstationStartup.inc:889
 #: admin/systems/goto/class_workstationService.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:332
-#: admin/systems/goto/class_terminalGeneric.inc:593
-#: personal/environment/class_environment.inc:1063
-#: personal/environment/class_environment.inc:1320
+#: admin/systems/goto/class_terminalGeneric.inc:334
+#: admin/systems/goto/class_terminalGeneric.inc:600
+#: personal/environment/class_environment.inc:1066
+#: personal/environment/class_environment.inc:1323
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -327,14 +328,14 @@ msgid "System group"
 msgstr "信赖的系统"
 
 #: admin/ogroups/goto/class_termgroup.inc:392
-#: admin/systems/goto/class_workstationGeneric.inc:697
-#: admin/systems/goto/class_terminalGeneric.inc:691
+#: admin/systems/goto/class_workstationGeneric.inc:704
+#: admin/systems/goto/class_terminalGeneric.inc:698
 #, fuzzy
 msgid "Action flag"
 msgstr "行动"
 
 #: admin/ogroups/goto/class_termgroup.inc:393
-#: admin/systems/goto/class_workstationGeneric.inc:694
+#: admin/systems/goto/class_workstationGeneric.inc:701
 #, fuzzy
 msgid "Ntp server"
 msgstr "NTP 服务器"
@@ -381,41 +382,49 @@ msgid "Application settings"
 msgstr "应用程序设置"
 
 #: admin/groups/apps/edit_entry.tpl:43 admin/devices/device-list.xml:41
-#: admin/devices/class_deviceGeneric.inc:97
-#: admin/devices/class_deviceGeneric.inc:121
-#: admin/devices/class_deviceGeneric.inc:272
+#: admin/devices/device-filter.tpl:17 admin/devices/class_deviceGeneric.inc:97
+#: admin/devices/class_deviceGeneric.inc:126
+#: admin/devices/class_deviceGeneric.inc:277
 #: admin/applications/class_applicationParameters.inc:190
 #: admin/applications/application-list.xml:41
+#: admin/applications/application-filter.tpl:15
 #: admin/applications/application-list-release.xml:41
+#: admin/applications/application-filter-release.tpl:23
 #: admin/applications/class_applicationGeneric.inc:400
 #: admin/applications/class_applicationGeneric.inc:404
 #: admin/applications/class_applicationGeneric.inc:576
 #: admin/applications/class_applicationGeneric.inc:580
 #: admin/mimetypes/mimetype-list-release.xml:41
+#: admin/mimetypes/mimetype-filter-release.tpl:23
 #: admin/mimetypes/mimetype-list.xml:41
 #: admin/mimetypes/class_mimetypeGeneric.inc:500
 #: admin/mimetypes/class_mimetypeGeneric.inc:692
+#: admin/mimetypes/mimetype-filter.tpl:15
 #: admin/systems/services/shares/class_goShareServer.inc:422
 #: admin/systems/services/nfs/class_servNfs.inc:199
 #: admin/systems/services/nfs/class_servNfs.inc:202
 #: admin/systems/services/nfs/class_servNfs.inc:235
 #: admin/systems/services/nfs/servnfs.tpl:9
 #: admin/systems/goto/class_printGeneric.inc:734
-#: admin/systems/goto/class_printGeneric.inc:739
-#: admin/systems/goto/class_printGeneric.inc:758
-#: admin/systems/goto/class_printGeneric.inc:998
+#: admin/systems/goto/class_printGeneric.inc:744
+#: admin/systems/goto/class_printGeneric.inc:763
+#: admin/systems/goto/class_printGeneric.inc:1003
 #: admin/systems/goto/class_ArpNewDevice.inc:88
-#: admin/systems/goto/class_workstationGeneric.inc:437
-#: admin/systems/goto/class_workstationGeneric.inc:442
-#: admin/systems/goto/class_workstationGeneric.inc:460
-#: admin/systems/goto/class_terminalGeneric.inc:428
-#: admin/systems/goto/class_terminalGeneric.inc:433
-#: admin/systems/goto/class_terminalGeneric.inc:452
-#: admin/systems/goto/class_terminalGeneric.inc:678
+#: admin/systems/goto/class_workstationGeneric.inc:439
+#: admin/systems/goto/class_workstationGeneric.inc:444
+#: admin/systems/goto/class_workstationGeneric.inc:467
+#: admin/systems/goto/class_terminalGeneric.inc:430
+#: admin/systems/goto/class_terminalGeneric.inc:440
+#: admin/systems/goto/class_terminalGeneric.inc:459
+#: admin/systems/goto/class_terminalGeneric.inc:685
+#: addons/goto/events/eventTargetSystems-filter.tpl:23
+#: addons/goto/events/eventTargetUser-filter.tpl:21
 #: addons/goto/events/eventTargetSystems-list.xml:65
 #: addons/goto/events/eventTargetUser-list.xml:49
 #: personal/environment/printerSelect/selectPrinter-list.xml:40
+#: personal/environment/printerSelect/selectPrinter-filter.tpl:17
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:40
+#: personal/environment/hotplugSelect/selectHotplug-filter.tpl:17
 #: personal/environment/class_logonManagementDialog.inc:103
 msgid "Name"
 msgstr "名称"
@@ -527,7 +536,7 @@ msgstr "向下移动"
 #: admin/systems/goto/terminalService.tpl:212
 #: admin/systems/goto/terminalStartup.tpl:115
 #: admin/systems/goto/workstationStartup.tpl:233
-#: admin/systems/goto/printer.tpl:75 addons/goto/class_gotomasses.inc:259
+#: admin/systems/goto/printer.tpl:85 addons/goto/class_gotomasses.inc:259
 #: addons/goto/deploy-list.xml:145 addons/goto/deploy-list.xml:249
 #: addons/goto/events/class_DaemonEvent.inc:256
 #: personal/environment/environment.tpl:238
@@ -536,7 +545,7 @@ msgstr "删除"
 
 #: admin/groups/apps/app_list.tpl:88 admin/groups/apps/app_list.tpl:134
 #: admin/systems/services/shares/goShareServer.tpl:17
-#: admin/systems/goto/printer.tpl:72 addons/goto/deploy-list.xml:241
+#: admin/systems/goto/printer.tpl:82 addons/goto/deploy-list.xml:241
 #: personal/environment/environment.tpl:274
 msgid "Edit"
 msgstr "编辑"
@@ -584,7 +593,7 @@ msgid "List of devices"
 msgstr "设备列表"
 
 #: admin/devices/device-list.xml:15 admin/devices/device-list.xml:74
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/systems/goto/gotoLpdEnable.tpl:27
 #: admin/systems/goto/gotoLpdEnable.tpl:63
 #: personal/environment/hotplugSelect/selectHotplug-list.xml:14
@@ -593,7 +602,7 @@ msgstr "设备"
 
 #: admin/devices/device-list.xml:49 admin/devices/deviceGeneric.tpl:27
 #: admin/devices/class_deviceGeneric.inc:100
-#: admin/devices/class_deviceGeneric.inc:274 admin/applications/generic.tpl:33
+#: admin/devices/class_deviceGeneric.inc:279 admin/applications/generic.tpl:33
 #: admin/applications/application-list.xml:49
 #: admin/applications/application-list-release.xml:49
 #: admin/applications/class_applicationGeneric.inc:578
@@ -606,11 +615,11 @@ msgstr "设备"
 #: admin/systems/services/nfs/servnfs.tpl:19
 #: admin/systems/goto/workstation.tpl:19
 #: admin/systems/goto/ArpNewDevice.tpl:17
-#: admin/systems/goto/class_printGeneric.inc:1000
-#: admin/systems/goto/class_workstationGeneric.inc:689
-#: admin/systems/goto/class_terminalGeneric.inc:679
-#: admin/systems/goto/printer.tpl:16 admin/systems/goto/terminal.tpl:19
-#: addons/goto/class_gotomasses.inc:571
+#: admin/systems/goto/class_printGeneric.inc:1005
+#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_terminalGeneric.inc:686
+#: admin/systems/goto/printer.tpl:16 admin/systems/goto/printer.tpl:42
+#: admin/systems/goto/terminal.tpl:19 addons/goto/class_gotomasses.inc:571
 #: addons/goto/events/eventTargetSystems-list.xml:73
 #: addons/goto/events/eventTargetUser-list.xml:57
 #: personal/environment/printerSelect/selectPrinter-list.xml:48
@@ -646,11 +655,11 @@ msgid "Remove device"
 msgstr "删除图片"
 
 #: admin/devices/deviceGeneric.tpl:2 admin/devices/paste_deviceGeneric.tpl:2
-#: admin/devices/class_deviceGeneric.inc:269
+#: admin/devices/class_deviceGeneric.inc:274
 msgid "Devices"
 msgstr "设备"
 
-#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:273
+#: admin/devices/deviceGeneric.tpl:9 admin/devices/class_deviceGeneric.inc:278
 #: admin/devices/device-list.tpl:13 admin/applications/generic.tpl:42
 #: admin/applications/class_applicationGeneric.inc:577
 #: admin/applications/application-list.tpl:13 admin/mimetypes/generic.tpl:44
@@ -658,9 +667,9 @@ msgstr "设备"
 #: admin/mimetypes/class_mimetypeGeneric.inc:695
 #: admin/systems/services/ldap/class_goLdapServer.inc:82
 #: admin/systems/goto/workstation.tpl:35
-#: admin/systems/goto/class_printGeneric.inc:999
-#: admin/systems/goto/class_workstationGeneric.inc:691
-#: admin/systems/goto/class_terminalGeneric.inc:680
+#: admin/systems/goto/class_printGeneric.inc:1004
+#: admin/systems/goto/class_workstationGeneric.inc:698
+#: admin/systems/goto/class_terminalGeneric.inc:687
 #: admin/systems/goto/printer.tpl:27 admin/systems/goto/terminal.tpl:27
 #: addons/goto/goto_import_file.tpl:41
 #: addons/goto/events/eventTargetSystems-list.tpl:13
@@ -743,8 +752,8 @@ msgstr ""
 msgid "iSerial"
 msgstr "(iSerial)"
 
-#: admin/devices/class_deviceGeneric.inc:145
-#: admin/devices/class_deviceGeneric.inc:171
+#: admin/devices/class_deviceGeneric.inc:150
+#: admin/devices/class_deviceGeneric.inc:176
 #: admin/applications/class_applicationGeneric.inc:234
 #: admin/applications/class_applicationGeneric.inc:308
 #: admin/applications/class_applicationGeneric.inc:340
@@ -764,40 +773,40 @@ msgstr "(iSerial)"
 #: admin/systems/goto/class_printGeneric.inc:639
 #: admin/systems/goto/class_printGeneric.inc:646
 #: admin/systems/goto/class_printGeneric.inc:700
-#: admin/systems/goto/class_printGeneric.inc:1077
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1082
+#: admin/systems/goto/class_printGeneric.inc:1093
 #: admin/systems/goto/class_terminalStartup.inc:223
-#: admin/systems/goto/class_workstationGeneric.inc:393
+#: admin/systems/goto/class_workstationGeneric.inc:395
 #: admin/systems/goto/class_workstationStartup.inc:234
 #: admin/systems/goto/class_workstationStartup.inc:247
 #: admin/systems/goto/class_workstationStartup.inc:324
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: admin/systems/goto/class_terminalGeneric.inc:379
+#: admin/systems/goto/class_terminalGeneric.inc:381
 #: addons/goto/class_gotoLogView.inc:57 addons/goto/class_gotoLogView.inc:175
 #: addons/goto/class_gotomasses.inc:178 addons/goto/class_gotomasses.inc:325
 #: addons/goto/class_gotomasses.inc:329 addons/goto/class_gotomasses.inc:479
 #: addons/goto/class_gotomasses.inc:514 addons/goto/class_gotomasses.inc:550
 #: addons/goto/class_filterGotoEvents.inc:18
-#: personal/environment/class_environment.inc:591
-#: personal/environment/class_environment.inc:673
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:592
+#: personal/environment/class_environment.inc:674
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
+#: personal/environment/class_environment.inc:996
 msgid "Error"
 msgstr "错误"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Device generic"
 msgstr "服务器名称"
 
-#: admin/devices/class_deviceGeneric.inc:264
+#: admin/devices/class_deviceGeneric.inc:269
 #, fuzzy
 msgid "Hotplug"
 msgstr "热插拔设备"
 
-#: admin/devices/class_deviceGeneric.inc:275
+#: admin/devices/class_deviceGeneric.inc:280
 #: admin/systems/services/shares/class_goShareServer.inc:425
 #: admin/systems/services/nfs/class_servNfs.inc:193
 #: admin/systems/services/nfs/servnfs.tpl:56
@@ -809,24 +818,24 @@ msgstr "热插拔设备"
 msgid "Type"
 msgstr "类型"
 
-#: admin/devices/class_deviceGeneric.inc:276
+#: admin/devices/class_deviceGeneric.inc:281
 #: admin/systems/goto/class_gotoLpdEnabled.inc:51
 #, fuzzy
 msgid "Serial"
 msgstr "(iSerial)"
 
-#: admin/devices/class_deviceGeneric.inc:277
+#: admin/devices/class_deviceGeneric.inc:282
 #, fuzzy
 msgid "Vendor"
 msgstr "供应商-ID"
 
-#: admin/devices/class_deviceGeneric.inc:278
+#: admin/devices/class_deviceGeneric.inc:283
 #, fuzzy
 msgid "Device ID"
 msgstr "设备"
 
 #: admin/devices/class_deviceManagement.inc:25
-#: personal/environment/class_environment.inc:1788
+#: personal/environment/class_environment.inc:1791
 #: personal/environment/environment.tpl:293
 msgid "Hotplug devices"
 msgstr "热插拔设备"
@@ -1239,7 +1248,7 @@ msgid "Kiosk profile service"
 msgstr "Kiosk profile 设置"
 
 #: admin/systems/services/kiosk/class_goKioskService.inc:154
-#: personal/environment/class_environment.inc:1789
+#: personal/environment/class_environment.inc:1792
 #: personal/environment/environment.tpl:124
 #: personal/environment/environment.tpl:160
 msgid "Kiosk profile"
@@ -1358,7 +1367,7 @@ msgstr ""
 #: admin/systems/goto/class_workstationStartup.inc:1034
 #: admin/systems/goto/terminalStartup.tpl:91
 #: admin/systems/goto/workstationStartup.tpl:209
-#: personal/environment/class_environment.inc:1787
+#: personal/environment/class_environment.inc:1790
 #: personal/environment/environment.tpl:212
 msgid "Shares"
 msgstr "共享"
@@ -1445,13 +1454,13 @@ msgid "Workstation template"
 msgstr "工作站模板"
 
 #: admin/systems/goto/workstation.tpl:10
-#: admin/systems/goto/class_workstationGeneric.inc:688
+#: admin/systems/goto/class_workstationGeneric.inc:695
 msgid "Workstation name"
 msgstr "工作站名称"
 
 #: admin/systems/goto/workstation.tpl:27
-#: admin/systems/goto/class_printGeneric.inc:1001
-#: admin/systems/goto/class_workstationGeneric.inc:690
+#: admin/systems/goto/class_printGeneric.inc:1006
+#: admin/systems/goto/class_workstationGeneric.inc:697
 msgid "Location"
 msgstr "位置"
 
@@ -1596,7 +1605,7 @@ msgid "none"
 msgstr "无"
 
 #: admin/systems/goto/class_printGeneric.inc:114
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, fuzzy
 msgid "Internal error"
 msgstr "终端服务器"
@@ -1679,13 +1688,13 @@ msgstr "该打印机属于终端 %s。您不能重命名该打印机。"
 #: admin/systems/goto/class_printGeneric.inc:590
 #: admin/systems/goto/class_terminalStartup.inc:180
 #: admin/systems/goto/class_terminalInfo.inc:68
-#: admin/systems/goto/class_terminalGeneric.inc:209
+#: admin/systems/goto/class_terminalGeneric.inc:211
 #, fuzzy
 msgid "terminal"
 msgstr "终端"
 
 #: admin/systems/goto/class_printGeneric.inc:592
-#: admin/systems/goto/class_workstationGeneric.inc:234
+#: admin/systems/goto/class_workstationGeneric.inc:236
 #: admin/systems/goto/class_workstationStartup.inc:285
 #, fuzzy
 msgid "workstation"
@@ -1697,28 +1706,28 @@ msgstr "工作站"
 msgid "Object is no printer!"
 msgstr "网络打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:744
-#: admin/systems/goto/printer.tpl:49
+#: admin/systems/goto/class_printGeneric.inc:749
+#: admin/systems/goto/printer.tpl:59
 msgid "Printer URL"
 msgstr "打印机 URL"
 
-#: admin/systems/goto/class_printGeneric.inc:972
-#: admin/systems/goto/class_printGeneric.inc:974
+#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:979
 #: addons/goto/events/eventTargetUser-list.xml:23
 msgid "Group"
 msgstr "组"
 
-#: admin/systems/goto/class_printGeneric.inc:977
+#: admin/systems/goto/class_printGeneric.inc:982
 #: addons/goto/events/eventTargetUser-list.xml:15
 msgid "User"
 msgstr "用户"
 
-#: admin/systems/goto/class_printGeneric.inc:990
+#: admin/systems/goto/class_printGeneric.inc:995
 #, fuzzy
 msgid "Print generic"
 msgstr "打印服务"
 
-#: admin/systems/goto/class_printGeneric.inc:995
+#: admin/systems/goto/class_printGeneric.inc:1000
 #: admin/systems/goto/terminalService.tpl:245
 #: personal/environment/printerSelect/selectPrinter-list.xml:14
 #: personal/environment/environment.tpl:338
@@ -1726,44 +1735,44 @@ msgstr "打印服务"
 msgid "Printer"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:1002
+#: admin/systems/goto/class_printGeneric.inc:1007
 msgid "LabeledURL"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1003
+#: admin/systems/goto/class_printGeneric.inc:1008
 #, fuzzy
 msgid "Printer PPD"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:1004
-#: admin/systems/goto/printer.tpl:86
+#: admin/systems/goto/class_printGeneric.inc:1009
+#: admin/systems/goto/printer.tpl:96
 msgid "Permissions"
 msgstr "允许"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
-#: personal/environment/class_environment.inc:583
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
+#: personal/environment/class_environment.inc:584
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: admin/systems/goto/class_printGeneric.inc:1020
-#: admin/systems/goto/class_printGeneric.inc:1042
+#: admin/systems/goto/class_printGeneric.inc:1025
+#: admin/systems/goto/class_printGeneric.inc:1047
 #, fuzzy
 msgid "printer user"
 msgstr "打印机"
 
-#: admin/systems/goto/class_printGeneric.inc:1037
+#: admin/systems/goto/class_printGeneric.inc:1042
 #, php-format
 msgid "Illegal member type '%s'!"
 msgstr ""
 
-#: admin/systems/goto/class_printGeneric.inc:1077
+#: admin/systems/goto/class_printGeneric.inc:1082
 #, fuzzy, php-format
 msgid "'%s' is already used!"
 msgstr "该名称已经被使用。"
 
-#: admin/systems/goto/class_printGeneric.inc:1088
+#: admin/systems/goto/class_printGeneric.inc:1093
 #, fuzzy, php-format
 msgid "'%s' does not exist!"
 msgstr "PPD 管理员：给出的路径 '%s' 不存在。"
@@ -1781,9 +1790,9 @@ msgstr "命令 '%s'，作为插件 '%s' 的 KERNELS hook 好像并不存在。"
 
 #: admin/systems/goto/class_terminalStartup.inc:223
 #: admin/systems/goto/class_workstationStartup.inc:432
-#: personal/environment/class_environment.inc:675
-#: personal/environment/class_environment.inc:677
-#: personal/environment/class_environment.inc:688
+#: personal/environment/class_environment.inc:676
+#: personal/environment/class_environment.inc:678
+#: personal/environment/class_environment.inc:689
 #, fuzzy
 msgid "Mount point"
 msgstr "挂载点"
@@ -1877,7 +1886,7 @@ msgid "System informations"
 msgstr "系统信息"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
-#: admin/systems/goto/class_workstationGeneric.inc:685
+#: admin/systems/goto/class_workstationGeneric.inc:692
 #: admin/systems/goto/class_SelectDeviceType.inc:38
 #: addons/goto/events/eventTargetSystems-list.xml:23
 msgid "Workstation"
@@ -1885,8 +1894,8 @@ msgstr "工作站"
 
 #: admin/systems/goto/class_ArpNewDevice.inc:38
 #: admin/systems/goto/class_SelectDeviceType.inc:38
-#: admin/systems/goto/class_terminalGeneric.inc:669
-#: admin/systems/goto/class_terminalGeneric.inc:675
+#: admin/systems/goto/class_terminalGeneric.inc:676
+#: admin/systems/goto/class_terminalGeneric.inc:682
 #: addons/goto/events/eventTargetSystems-list.xml:31
 msgid "Terminal"
 msgstr "终端"
@@ -1903,7 +1912,7 @@ msgstr "Windows 工作站"
 #: admin/systems/goto/class_workstationService.inc:78
 #: admin/systems/ppd/class_printerPPDDialog.inc:54
 #: admin/systems/ppd/class_printerPPDDialog.inc:120
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
@@ -2194,8 +2203,8 @@ msgstr "声音服务"
 msgid "GUI"
 msgstr "GUI"
 
-#: admin/systems/goto/class_workstationGeneric.inc:276
-#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_workstationGeneric.inc:278
+#: admin/systems/goto/class_workstationGeneric.inc:288
 #: addons/goto/deploy-list.xml:105
 #: addons/goto/events/class_DaemonEvent_update.inc:29
 #: addons/goto/events/class_DaemonEvent_update.inc:30
@@ -2203,50 +2212,50 @@ msgstr "GUI"
 msgid "Software update"
 msgstr "立即更新"
 
-#: admin/systems/goto/class_workstationGeneric.inc:280
-#: admin/systems/goto/class_workstationGeneric.inc:288
+#: admin/systems/goto/class_workstationGeneric.inc:282
+#: admin/systems/goto/class_workstationGeneric.inc:290
 #: addons/goto/events/class_DaemonEvent_localboot.inc:28
 #: addons/goto/events/class_DaemonEvent_localboot.inc:29
 msgid "Force localboot"
 msgstr "强制本地启动"
 
-#: admin/systems/goto/class_workstationGeneric.inc:284
-#: admin/systems/goto/class_terminalGeneric.inc:249
+#: admin/systems/goto/class_workstationGeneric.inc:286
+#: admin/systems/goto/class_terminalGeneric.inc:251
 #: addons/goto/deploy-list.xml:98
 #: addons/goto/events/class_DaemonEvent_wakeup.inc:29
 msgid "Wake up"
 msgstr "唤醒"
 
-#: admin/systems/goto/class_workstationGeneric.inc:481
+#: admin/systems/goto/class_workstationGeneric.inc:488
 msgid "A valid LDAP server assignement is missing!"
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:491
+#: admin/systems/goto/class_workstationGeneric.inc:498
 #, fuzzy
 msgid "Software deployment"
 msgstr "系统类型"
 
-#: admin/systems/goto/class_workstationGeneric.inc:492
+#: admin/systems/goto/class_workstationGeneric.inc:499
 msgid "This host is currently installing. If you want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/goto/class_workstationGeneric.inc:680
+#: admin/systems/goto/class_workstationGeneric.inc:687
 #, fuzzy
 msgid "Workstation generic"
 msgstr "工作站名称"
 
-#: admin/systems/goto/class_workstationGeneric.inc:692
+#: admin/systems/goto/class_workstationGeneric.inc:699
 #, fuzzy
 msgid "Goto mode"
 msgstr "到目录"
 
-#: admin/systems/goto/class_workstationGeneric.inc:695
-#: admin/systems/goto/class_terminalGeneric.inc:689
+#: admin/systems/goto/class_workstationGeneric.inc:702
+#: admin/systems/goto/class_terminalGeneric.inc:696
 #, fuzzy
 msgid "Root password"
 msgstr "设置口令"
 
-#: admin/systems/goto/class_workstationGeneric.inc:696
+#: admin/systems/goto/class_workstationGeneric.inc:703
 #, fuzzy
 msgid "Create FAI CD"
 msgstr "创建"
@@ -2313,7 +2322,7 @@ msgstr "电话"
 
 #: admin/systems/goto/terminalService.tpl:98
 #: admin/systems/goto/workstationService.tpl:110
-#: admin/systems/goto/printer.tpl:70
+#: admin/systems/goto/printer.tpl:80
 msgid "Driver"
 msgstr "驱动"
 
@@ -2324,7 +2333,7 @@ msgstr "选择安装的显卡需要的显卡驱动"
 
 #: admin/systems/goto/terminalService.tpl:108
 #: admin/systems/goto/workstationService.tpl:122
-#: personal/environment/class_environment.inc:1791
+#: personal/environment/class_environment.inc:1794
 #: personal/environment/environment.tpl:183
 msgid "Resolution"
 msgstr "分辨率"
@@ -2628,17 +2637,17 @@ msgstr "分配的 FAI 类"
 msgid "set"
 msgstr "设置"
 
-#: admin/systems/goto/class_terminalGeneric.inc:670
+#: admin/systems/goto/class_terminalGeneric.inc:677
 #, fuzzy
 msgid "Terminal generic"
 msgstr "终端服务"
 
-#: admin/systems/goto/class_terminalGeneric.inc:683
+#: admin/systems/goto/class_terminalGeneric.inc:690
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "日志服务器"
 
-#: admin/systems/goto/class_terminalGeneric.inc:688
+#: admin/systems/goto/class_terminalGeneric.inc:695
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "用户设置"
@@ -2655,27 +2664,27 @@ msgstr "打印机名称"
 msgid "Details"
 msgstr "详细"
 
-#: admin/systems/goto/printer.tpl:41
+#: admin/systems/goto/printer.tpl:51
 msgid "Printer location"
 msgstr "打印机位置"
 
-#: admin/systems/goto/printer.tpl:58
+#: admin/systems/goto/printer.tpl:68
 msgid "PPD Provider"
 msgstr ""
 
-#: admin/systems/goto/printer.tpl:93
+#: admin/systems/goto/printer.tpl:103
 msgid "Users which are allowed to use this printer"
 msgstr "允许使用该打印机的用户"
 
-#: admin/systems/goto/printer.tpl:95
+#: admin/systems/goto/printer.tpl:105
 msgid "Users"
 msgstr "用户"
 
-#: admin/systems/goto/printer.tpl:114
+#: admin/systems/goto/printer.tpl:124
 msgid "Users which are allowed to administrate this printer"
 msgstr "允许管理该打印机的用户"
 
-#: admin/systems/goto/printer.tpl:116
+#: admin/systems/goto/printer.tpl:126
 msgid "Admins"
 msgstr "管理员"
 
@@ -2772,7 +2781,7 @@ msgid "The temporary file '%s' cannot be opened for writing."
 msgstr "请求的 tmp 文件 '%s' 无法以写方式打开。"
 
 #: admin/systems/ppd/class_ppdManager.inc:196
-#: admin/systems/ppd/class_ppdManager.inc:326
+#: admin/systems/ppd/class_ppdManager.inc:334
 #, fuzzy
 msgid "Parsing PPD file failed - file is empty!"
 msgstr "解析 PPD 文件 %s 失败──未找到信息。"
@@ -2805,14 +2814,14 @@ msgstr "不支持嵌套选项！"
 msgid "PickMany is not supported yet!"
 msgstr "尚不支持 PickMany！"
 
-#: admin/systems/ppd/class_ppdManager.inc:346
+#: admin/systems/ppd/class_ppdManager.inc:354
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr "解析 PPD 文件 %s 失败──行太长。截断的字符被忽略。"
 
-#: admin/systems/ppd/class_ppdManager.inc:371
+#: admin/systems/ppd/class_ppdManager.inc:379
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr "解析 PPD 文件 %s 失败──未找到信息。"
@@ -3551,21 +3560,21 @@ msgid "Import complete: %s events successfully send, %s failed"
 msgstr ""
 
 #: personal/environment/class_environment.inc:9
-#: personal/environment/class_environment.inc:433
 #: personal/environment/class_environment.inc:434
-#: personal/environment/class_environment.inc:442
+#: personal/environment/class_environment.inc:435
 #: personal/environment/class_environment.inc:443
-#: personal/environment/class_environment.inc:446
+#: personal/environment/class_environment.inc:444
 #: personal/environment/class_environment.inc:447
-#: personal/environment/class_environment.inc:450
+#: personal/environment/class_environment.inc:448
 #: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:473
+#: personal/environment/class_environment.inc:452
 #: personal/environment/class_environment.inc:474
-#: personal/environment/class_environment.inc:478
+#: personal/environment/class_environment.inc:475
 #: personal/environment/class_environment.inc:479
-#: personal/environment/class_environment.inc:482
+#: personal/environment/class_environment.inc:480
 #: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1771
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1774
 msgid "Environment"
 msgstr "环境设置"
 
@@ -3574,141 +3583,141 @@ msgstr "环境设置"
 msgid "This does something"
 msgstr "******"
 
-#: personal/environment/class_environment.inc:139
+#: personal/environment/class_environment.inc:140
 #, fuzzy, php-format
 msgid "Device '%s' is not available anymore. It will be removed!"
 msgstr "没有可用的 mysql 扩展，请检查您的 php 设置。"
 
-#: personal/environment/class_environment.inc:212
+#: personal/environment/class_environment.inc:213
 msgid "auto"
 msgstr "自动"
 
-#: personal/environment/class_environment.inc:234
+#: personal/environment/class_environment.inc:235
 #, fuzzy, php-format
 msgid "Cannot open file '%s'!"
 msgstr "无法打开文件 '%s'。"
 
-#: personal/environment/class_environment.inc:271
 #: personal/environment/class_environment.inc:272
+#: personal/environment/class_environment.inc:273
 msgid "disabled"
 msgstr "禁用"
 
-#: personal/environment/class_environment.inc:307
+#: personal/environment/class_environment.inc:308
 #, php-format
 msgid ""
 "Kiosk profile '%s' located on server '%s' is not available anymore. Kiosk "
 "profile will be disabled!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:360
+#: personal/environment/class_environment.inc:361
 #, fuzzy, php-format
 msgid "Profile server '%s' is not available anymore. Switched to server '%s'."
 msgstr "选择的 kiosk profile '%s' 不存在，设置当前 profile 为 'none'。"
 
-#: personal/environment/class_environment.inc:364
+#: personal/environment/class_environment.inc:365
 #, fuzzy, php-format
 msgid ""
 "Profile server '%s' is not available anymore. Kiosk profile will be disabled."
 msgstr "选择的 kiosk profile '%s' 不存在，设置当前 profile 为 'none'。"
 
-#: personal/environment/class_environment.inc:451
-#: personal/environment/class_environment.inc:483
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:452
+#: personal/environment/class_environment.inc:484
+#: personal/environment/class_environment.inc:1156
 msgid "POSIX"
 msgstr ""
 
-#: personal/environment/class_environment.inc:583
+#: personal/environment/class_environment.inc:584
 #: personal/environment/environment.tpl:246
 msgid "Logon scripts"
 msgstr "登录脚本"
 
-#: personal/environment/class_environment.inc:673
+#: personal/environment/class_environment.inc:674
 #, fuzzy
 msgid "Share"
 msgstr "共享"
 
-#: personal/environment/class_environment.inc:763
+#: personal/environment/class_environment.inc:764
 #: personal/environment/environment.tpl:257
 #: personal/environment/environment.tpl:303
 #, fuzzy
 msgid "Used by all users"
 msgstr "域用户"
 
-#: personal/environment/class_environment.inc:766
+#: personal/environment/class_environment.inc:767
 #: personal/environment/environment.tpl:259
 #: personal/environment/environment.tpl:305
 msgid "Used by some users"
 msgstr ""
 
-#: personal/environment/class_environment.inc:779
 #: personal/environment/class_environment.inc:780
-#: personal/environment/class_environment.inc:789
+#: personal/environment/class_environment.inc:781
 #: personal/environment/class_environment.inc:790
+#: personal/environment/class_environment.inc:791
 msgid "Reset password hash"
 msgstr "重置口令"
 
-#: personal/environment/class_environment.inc:794
+#: personal/environment/class_environment.inc:795
 msgid "Delete share entry"
 msgstr "删除共享条目"
 
-#: personal/environment/class_environment.inc:993
+#: personal/environment/class_environment.inc:996
 msgid "Cannot set default printer flag for groups!"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1146
-#: personal/environment/class_environment.inc:1716
-#: personal/environment/class_environment.inc:1785
+#: personal/environment/class_environment.inc:1149
+#: personal/environment/class_environment.inc:1719
+#: personal/environment/class_environment.inc:1788
 #, fuzzy
 msgid "Profile quota"
 msgstr "Profil quota"
 
-#: personal/environment/class_environment.inc:1153
+#: personal/environment/class_environment.inc:1156
 #, fuzzy
 msgid "environment"
 msgstr "环境设置"
 
-#: personal/environment/class_environment.inc:1334
+#: personal/environment/class_environment.inc:1337
 msgid "group share"
 msgstr "组共享"
 
-#: personal/environment/class_environment.inc:1368
+#: personal/environment/class_environment.inc:1371
 msgid "Administrator"
 msgstr "管理员"
 
-#: personal/environment/class_environment.inc:1373
+#: personal/environment/class_environment.inc:1376
 msgid "Default printer"
 msgstr "缺省打印机"
 
-#: personal/environment/class_environment.inc:1772
+#: personal/environment/class_environment.inc:1775
 #, fuzzy
 msgid "Environment settings"
 msgstr "用户环境设置"
 
-#: personal/environment/class_environment.inc:1776
+#: personal/environment/class_environment.inc:1779
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/environment/class_environment.inc:1780
+#: personal/environment/class_environment.inc:1783
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: personal/environment/class_environment.inc:1784
+#: personal/environment/class_environment.inc:1787
 #, fuzzy
 msgid "Profile server"
 msgstr "文件服务器"
 
-#: personal/environment/class_environment.inc:1786
+#: personal/environment/class_environment.inc:1789
 #: personal/environment/environment.tpl:41
 #: personal/environment/environment.tpl:106
 msgid "Cache profile localy"
 msgstr "本地缓存 profile"
 
-#: personal/environment/class_environment.inc:1790
+#: personal/environment/class_environment.inc:1793
 #: personal/environment/environment.tpl:174
 msgid "Resolution changeable during session"
 msgstr "会话间允许修改分辨率"
 
-#: personal/environment/class_environment.inc:1792
+#: personal/environment/class_environment.inc:1795
 #: personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr "登录脚本"
diff --git a/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po
index ab11b38cc..86ca617bc 100644
--- a/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-06-12 09:08+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po
index b74e5bf42..a22bf9bc6 100644
--- a/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-28 23:47+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -145,8 +146,7 @@ msgid ""
 "found for '%s'."
 msgstr ""
 "Hay un error cargando la configuración de heimdal, se ha encontrado mas de "
-"una "
-"entrada en la configuración para '%s'."
+"una entrada en la configuración para '%s'."
 
 #: admin/systems/services/kerberos/class_password-methods-heimdal.inc:157
 #: admin/systems/services/kerberos/class_password-methods-heimdal.inc:413
diff --git a/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po
index b57d136d3..81218c6de 100644
--- a/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-06-30 11:11+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po
index 0e500fad0..ebf17d1ea 100644
--- a/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/messages.po b/gosa-plugins/heimdal/locale/messages.po
index 5cfebd48f..75fd41211 100644
--- a/gosa-plugins/heimdal/locale/messages.po
+++ b/gosa-plugins/heimdal/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po
index 30998836c..4519d9445 100644
--- a/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po
index 6a9776cc9..6c3539628 100644
--- a/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-09-05 15:38+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po
index a88dd9236..9ac325ff3 100644
--- a/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po
index ed7f2ebff..e19176bdc 100644
--- a/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/heimdal/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po
index 1e618382b..4f0d0f615 100644
--- a/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2008-12-19 08:56+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po
index aff238ae3..a78adebda 100644
--- a/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2010-01-24 23:38+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po
index 165c31fe5..05b8f7782 100644
--- a/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2009-06-30 11:15+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po
index de495a31c..bae4e0ab9 100644
--- a/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/messages.po b/gosa-plugins/kolab/locale/messages.po
index 0fe94c579..b7a9317d1 100644
--- a/gosa-plugins/kolab/locale/messages.po
+++ b/gosa-plugins/kolab/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po
index 55c96c73a..3c6e73be4 100644
--- a/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po
index 01c7bde9c..9d2382311 100644
--- a/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po
index 96ac373d7..7fc4abc22 100644
--- a/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po
index 2d3e0e95d..d32edb2d3 100644
--- a/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/kolab/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:37+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po
index ea0162498..237161904 100644
--- a/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/de/LC_MESSAGES/messages.po
@@ -12,31 +12,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-12-03 15:10+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-msgid "Permission error"
-msgstr "Berechtigungsfehler"
-
-#: html/getldif.php:82
-msgid "You have no permission to create LDAP dumps!"
-msgstr "Sie sind nicht berechtigt, um LDAP-Abzüge zu erstellen!"
-
-#: html/getldif.php:107
-msgid "Error in ivbb parameter!"
-msgstr "Fehler in ivbb Parameter!"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr "Geburtstag"
@@ -236,7 +221,14 @@ msgstr "Voll"
 msgid "Computers of %s on %s"
 msgstr "Computer von %s auf %s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+msgid "Permission error"
+msgstr "Berechtigungsfehler"
+
+#: html/getxls.php:478
 msgid "You have no permission to do LDAP exports!"
 msgstr "Sie haben keine Berechtigung, um aus dem LDAP zu exportieren!"
 
@@ -261,45 +253,47 @@ msgstr "Sie benötigen Vollzugriff auf den LDAP-Baum, um Daten zu importieren!"
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr "Fehler"
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kann hochgeladene Datei nicht lesen: %s"
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 msgid "file is empty"
 msgstr "Die Datei ist leer"
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 msgid "file not found"
 msgstr "Die Datei wurde nicht gefunden"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr "Die Datei ist nicht lesbar"
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -368,7 +362,7 @@ msgstr ""
 "beispielsweise zur Dokumentation/Übersicht verwendet werden."
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "Exportiere einzelnen Eintrag"
 
@@ -379,9 +373,8 @@ msgstr "Wählen Sie die Daten, die exportiert werden sollen"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Export"
 
@@ -391,18 +384,14 @@ msgstr "Exportiere vollständige XLS-Datei für"
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Wählen Sie die Abteilung, die exportiert werden soll"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr "Exportiere IVBB LDIF für"
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr "Export erfolgreich"
 
@@ -432,7 +421,7 @@ msgstr "Import"
 msgid "export"
 msgstr "Export"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -446,26 +435,15 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr "Exportiere vollständige LDIF-Datei für"
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr ""
-"Hier klicken, um die gesamte LDAP-Datenbank in eine Datei zu exportieren."
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Hier klicken, um die exportierten Daten in eine Datei zu speichern"
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr "XLS-Import"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 msgid "Cannot export selected entries!"
 msgstr "Kann die gewählten Einträge nicht exportieren!"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "Sie haben keine Berechtigung, um '%s' zu exportieren!"
@@ -475,12 +453,12 @@ msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 "Das CSV Import Plugin stellt Methoden bereit, um Benutzerkonten aus einer "
 "CSV Datei zu generieren. Der Administrator kann die Zuordnung zwischen "
 "Spalte und Benutzerattribut frei wählen. Es müssen jedoch mindestens die "
-"Attribute UID, GIVENNAME und SURENAME gesetzt sein."
+"Attribute UID, GIVENNAME und SURNAME gesetzt sein."
 
 #: addons/ldapmanager/contentcsv.tpl:10
 msgid "Select CSV file to import"
@@ -514,32 +492,32 @@ msgstr "Sie haben keine Berechtigung, um CSV Dateien zu importieren."
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr "Benötige mindestens 'sn', 'givenName' und 'uid' um Benutzer anzulegen."
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr "Fehlgeschlagen"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr "ok"
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr "Status"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "Kann Eintrag '%s' nicht einfügen!"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Information"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr "Nichts zu importieren!"
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 msgid "Cannot find CSV data in the selected file!"
 msgstr "Kann keine CSV-Daten in der gewählten Datei finden!"
 
@@ -547,5 +525,16 @@ msgstr "Kann keine CSV-Daten in der gewählten Datei finden!"
 msgid "CSV import"
 msgstr "CSV-Import"
 
-#~ msgid "Ldap manger"
-#~ msgstr "LDAP-Manager"
+#: addons/ldapmanager/class_export.inc:70
+#, php-format
+msgid "No such object %s!"
+msgstr "Objekt %s nicht gefunden!"
+
+#: addons/ldapmanager/class_export.inc:87
+msgid "You have no permission to export %s!"
+msgstr "Sie haben keine Berechtigung, um %s zu exportieren!"
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr "Konnte keinen LDAP-Export erzeugen: '%s'!"
diff --git a/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po
index 2fd6a7a46..7880efce4 100644
--- a/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/es/LC_MESSAGES/messages.po
@@ -8,32 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-25 01:11+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-msgid "Permission error"
-msgstr "Error de permisos"
-
-#: html/getldif.php:82
-msgid "You have no permission to create LDAP dumps!"
-msgstr "¡No tiene permisos para crear volcados LDAP!"
-
-#: html/getldif.php:107
-msgid "Error in ivbb parameter!"
-msgstr "¡Error en parámetro ivbb!"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr "Fecha de nacimiento"
@@ -233,7 +218,14 @@ msgstr "Lleno"
 msgid "Computers of %s on %s"
 msgstr "Ordenadores de %s en %s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+msgid "Permission error"
+msgstr "Error de permisos"
+
+#: html/getxls.php:478
 msgid "You have no permission to do LDAP exports!"
 msgstr "¡No tiene permisos para realizar volcados LDAP!"
 
@@ -258,45 +250,47 @@ msgstr "¡Necesita permisos de escritura para importar datos al arbol LDAP!"
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr "Error"
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "No puedo leer el archivo: %s"
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 msgid "file is empty"
 msgstr "el archivo está vacío"
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 msgid "file not found"
 msgstr "fichero no encontrado"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr "fichero no accesible"
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -364,7 +358,7 @@ msgstr ""
 "documentación."
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "Exportar solo esta entrada"
 
@@ -375,9 +369,8 @@ msgstr "Elija la información que quiera exportar"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Exportar"
 
@@ -387,18 +380,14 @@ msgstr "Exportación del XLS completada para"
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Elija el departamento que quiera exportar"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr "Exportación IVBB LDIF para"
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr "Exportación completada"
 
@@ -428,7 +417,7 @@ msgstr "importar"
 msgid "export"
 msgstr "exportar"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -442,35 +431,26 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr "Exportación del LDIF completada para"
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Pulse aquí para guardar la base de datos LDAP completa a un archivo"
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Pulse aquí para guardar la exportación LDAP"
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr "Importar desde XLS"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 msgid "Cannot export selected entries!"
 msgstr "¡No se puede exportar las entradas seleccionadas!"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "¡No tiene permisos para exportar '%s'!"
 
 #: addons/ldapmanager/contentcsv.tpl:2
+#, fuzzy
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 "La extensión importar desde CSV tiene los metodos para generar cuentas desde "
 "un archivo que tiene valores separados por comas. El administrador puede "
@@ -510,32 +490,32 @@ msgstr "No tiene permisos para importar archivos CSV."
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr "Se necesita al menos 'sn', 'givenName' y 'uid' para crear un usuario."
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr "error"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr "ok"
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr "estado"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "¡No se puede introducir la entrada '%s'!"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Información"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr "¡No hay nada que importar!"
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 msgid "Cannot find CSV data in the selected file!"
 msgstr "¡No se puede encontrar información CSV en el archivo seleccionado!"
 
@@ -543,6 +523,33 @@ msgstr "¡No se puede encontrar información CSV en el archivo seleccionado!"
 msgid "CSV import"
 msgstr "Importar desde CSV"
 
+#: addons/ldapmanager/class_export.inc:70
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "¡No tiene permisos para exportar '%s'!"
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr "¡No tiene permisos para crear volcados LDAP!"
+
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "¡Error en parámetro ivbb!"
+
+#~ msgid "Click here to save the complete LDAP database to a file"
+#~ msgstr "Pulse aquí para guardar la base de datos LDAP completa a un archivo"
+
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "Pulse aquí para guardar la exportación LDAP"
+
 #, fuzzy
 #~ msgid "Surename"
 #~ msgstr "Apellidos"
diff --git a/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po
index 9110b1784..68ba4b4d3 100644
--- a/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/fr/LC_MESSAGES/messages.po
@@ -4,34 +4,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-12-21 12:02+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-msgid "Permission error"
-msgstr "Erreur de permission"
-
-#: html/getldif.php:82
-msgid "You have no permission to create LDAP dumps!"
-msgstr ""
-"Vous n'avez pas les droits nécessaires pour créer des sauvegarde de "
-"l'annuaire !"
-
-#: html/getldif.php:107
-msgid "Error in ivbb parameter!"
-msgstr "Erreur dans le paramètre ivbb !"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr "Anniversaire"
@@ -231,7 +214,14 @@ msgstr "Complet"
 msgid "Computers of %s on %s"
 msgstr "Ordinateurs de %s dans %s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+msgid "Permission error"
+msgstr "Erreur de permission"
+
+#: html/getxls.php:478
 msgid "You have no permission to do LDAP exports!"
 msgstr "Vous n'avez pas l'autorisation d'exporter l'annuaire !"
 
@@ -258,45 +248,47 @@ msgstr ""
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr "Erreur"
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Impossible de lire le fichier importé : '%s'"
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 msgid "file is empty"
 msgstr "le fichier est vide."
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 msgid "file not found"
 msgstr "le fichier n'a pas été trouvé"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr "le fichier n'est pas lisible"
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -364,7 +356,7 @@ msgstr ""
 "fins de documentation."
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "Exporter une seule entrée"
 
@@ -375,9 +367,8 @@ msgstr "Choisissez les données que vous voulez exporter"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Exporter"
 
@@ -387,18 +378,14 @@ msgstr "Exporter un fichier XLS complet pour "
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Choisissez le département que vous voulez exporter"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr "Exporter un LDIF IVBB pour"
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr "Exportation réussie"
 
@@ -429,7 +416,7 @@ msgstr "importer"
 msgid "export"
 msgstr "exporter"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -444,35 +431,26 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr "Exporter un fichier LDIF complet pour "
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Cliquez ici pour sauvegarder l'annuaire LDAP dans un fichier"
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Cliquez ici pour exporter l'annuaire LDAP "
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr "Importer un fichier XLS"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 msgid "Cannot export selected entries!"
 msgstr "Impossible d'exporter les entrées séléctionnées !"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "Vous n'avez pas l'autorisation d'exporter '%s' !"
 
 #: addons/ldapmanager/contentcsv.tpl:2
+#, fuzzy
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 "L'extension CSV permet de générer des comptes utilisateurs depuis un fichier "
 "contenant des valeurs séparées par des virgules. L'administrateur peut "
@@ -513,35 +491,64 @@ msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr ""
 "J'ai besoin d'un 'sn','givenName' et 'uid' pour créer des utilisateurs."
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr "échec"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr "ok"
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr "statut"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "Impossible d'insèrer l'entrée '%s' !"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Information"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr "Rien à importer !"
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 msgid "Cannot find CSV data in the selected file!"
 msgstr "Impossible de trouver des données CSV dans le fichier selectionné !"
 
 #: addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "Importation CSV"
+
+#: addons/ldapmanager/class_export.inc:70
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "Vous n'avez pas l'autorisation d'exporter '%s' !"
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr ""
+#~ "Vous n'avez pas les droits nécessaires pour créer des sauvegarde de "
+#~ "l'annuaire !"
+
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "Erreur dans le paramètre ivbb !"
+
+#~ msgid "Click here to save the complete LDAP database to a file"
+#~ msgstr "Cliquez ici pour sauvegarder l'annuaire LDAP dans un fichier"
+
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "Cliquez ici pour exporter l'annuaire LDAP "
diff --git a/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po
index aff8d7643..a3b70b925 100644
--- a/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/it/LC_MESSAGES/messages.po
@@ -6,34 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-#, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
-
-#: html/getldif.php:82
-#, fuzzy
-msgid "You have no permission to create LDAP dumps!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: html/getldif.php:107
-#, fuzzy
-msgid "Error in ivbb parameter!"
-msgstr "Parametro"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr ""
@@ -235,7 +217,15 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr "Computer di %s su %s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+#, fuzzy
+msgid "Permission error"
+msgstr "Permessi"
+
+#: html/getxls.php:478
 #, fuzzy
 msgid "You have no permission to do LDAP exports!"
 msgstr "Non hai il permesso di cambiare la tua password."
@@ -261,47 +251,49 @@ msgstr ""
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, fuzzy, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Rimuovi"
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 #, fuzzy
 msgid "file is empty"
 msgstr "Rimuovi"
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 #, fuzzy
 msgid "file not found"
 msgstr "Cognome"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -364,7 +356,7 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr ""
 
@@ -375,9 +367,8 @@ msgstr ""
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Esporta"
 
@@ -387,19 +378,15 @@ msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 #, fuzzy
 msgid "Choose the department you want to Export"
 msgstr "Scegli il dipartimento di base per la ricerca"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr ""
 
@@ -431,7 +418,7 @@ msgstr "Importa"
 msgid "export"
 msgstr "Esporta"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -442,28 +429,17 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr ""
-
-#: addons/ldapmanager/contentexport.tpl:59
-#, fuzzy
-msgid "Click here to save the LDAP Export "
-msgstr "Non hai il permesso di cambiare la tua password."
-
 #: addons/ldapmanager/class_exportxls.inc:6
 #, fuzzy
 msgid "XLS import"
 msgstr "Importa da formato CSV"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 #, fuzzy
 msgid "Cannot export selected entries!"
 msgstr "Gruppo di oggetti"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, fuzzy, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "Non hai il permesso di cambiare la tua password."
@@ -473,7 +449,7 @@ msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl:10
@@ -511,34 +487,34 @@ msgstr "Non hai il permesso di cambiare la tua password."
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 #, fuzzy
 msgid "failed"
 msgstr "Fallito"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 #, fuzzy
 msgid "status"
 msgstr "Stato"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, fuzzy, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "Rimuovi"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Informazioni"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 #, fuzzy
 msgid "Cannot find CSV data in the selected file!"
 msgstr "Rimuovi"
@@ -547,6 +523,33 @@ msgstr "Rimuovi"
 msgid "CSV import"
 msgstr "Importa da formato CSV"
 
+#: addons/ldapmanager/class_export.inc:70
+#, fuzzy, php-format
+msgid "No such object %s!"
+msgstr "Oggetti membri"
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#, fuzzy
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "Parametro"
+
+#, fuzzy
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
 #, fuzzy
 #~ msgid "Ldap manger"
 #~ msgstr "Amministrazione LDAP"
diff --git a/gosa-plugins/ldapmanager/locale/messages.po b/gosa-plugins/ldapmanager/locale/messages.po
index ccd755626..8c28c2f39 100644
--- a/gosa-plugins/ldapmanager/locale/messages.po
+++ b/gosa-plugins/ldapmanager/locale/messages.po
@@ -8,30 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-msgid "Permission error"
-msgstr ""
-
-#: html/getldif.php:82
-msgid "You have no permission to create LDAP dumps!"
-msgstr ""
-
-#: html/getldif.php:107
-msgid "Error in ivbb parameter!"
-msgstr ""
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr ""
@@ -231,7 +216,14 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr ""
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+msgid "Permission error"
+msgstr ""
+
+#: html/getxls.php:478
 msgid "You have no permission to do LDAP exports!"
 msgstr ""
 
@@ -256,45 +248,47 @@ msgstr ""
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 msgid "file is empty"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 msgid "file not found"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 msgid "LDAP error"
 msgstr ""
 
@@ -353,7 +347,7 @@ msgid ""
 msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr ""
 
@@ -364,9 +358,8 @@ msgstr ""
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr ""
 
@@ -376,18 +369,14 @@ msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr ""
 
@@ -416,7 +405,7 @@ msgstr ""
 msgid "export"
 msgstr ""
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -427,25 +416,15 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr ""
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr ""
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr ""
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 msgid "Cannot export selected entries!"
 msgstr ""
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, php-format
 msgid "You have no permission to export '%s'!"
 msgstr ""
@@ -455,7 +434,7 @@ msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl:10
@@ -490,35 +469,50 @@ msgstr ""
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 msgid "Cannot find CSV data in the selected file!"
 msgstr ""
 
 #: addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr ""
+
+#: addons/ldapmanager/class_export.inc:70
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_export.inc:87
+#, php-format
+msgid "You have no permission to export %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
diff --git a/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po
index 38c066aeb..545c1e0f4 100644
--- a/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/nl/LC_MESSAGES/messages.po
@@ -11,33 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-#, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
-
-#: html/getldif.php:82
-#, fuzzy
-msgid "You have no permission to create LDAP dumps!"
-msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
-
-#: html/getldif.php:107
-#, fuzzy
-msgid "Error in ivbb parameter!"
-msgstr "Controleer parameter"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr "Geboortedatum"
@@ -237,7 +219,15 @@ msgstr "Volledig"
 msgid "Computers of %s on %s"
 msgstr "Computers van %s in %s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+#, fuzzy
+msgid "Permission error"
+msgstr "Rechten"
+
+#: html/getxls.php:478
 #, fuzzy
 msgid "You have no permission to do LDAP exports!"
 msgstr ""
@@ -264,47 +254,49 @@ msgstr ""
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr "Fout"
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, fuzzy, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Kan bestand '%s' niet aanmaken."
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 #, fuzzy
 msgid "file is empty"
 msgstr "Het opgegeven bestand is leeg."
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 #, fuzzy
 msgid "file not found"
 msgstr "Bestandsnaam"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -374,7 +366,7 @@ msgstr ""
 "voor documentatie doeleinden opslaan."
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "Exporteer een enkel record"
 
@@ -385,9 +377,8 @@ msgstr "Selecteer de data die u wilt exporteren"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Exporteer"
 
@@ -397,18 +388,14 @@ msgstr "Exporteer een compleet XLS voor"
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Selecteer de afdeling die u wilt exporteren"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr "Exporteer IVBB LDIF voor"
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr "Export was succesvol"
 
@@ -440,7 +427,7 @@ msgstr "Importeren"
 msgid "export"
 msgstr "Exporteer"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -455,36 +442,27 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr "Exporteer een complete LDIF voor"
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Klik hier om de complete LDAP database op te slaan in een bestand."
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Klik hier om de LDAP export op te slaan in een bestand."
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr "XLS import"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 #, fuzzy
 msgid "Cannot export selected entries!"
 msgstr "Nieuw FAI object aanmaken"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, fuzzy, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "U heeft geen toestemming om LDAP gegevens te exporteren."
 
 #: addons/ldapmanager/contentcsv.tpl:2
+#, fuzzy
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 "De CSV import module bevat mothodes om gebruikers accounts aan te maken "
 "vanuit een bestand met komma gescheiden waardes. De beheerder kan bepalen "
@@ -525,32 +503,32 @@ msgstr "U heeft geen toestemming om CSV gegevens te importeren."
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr "'sn', 'givenName' en 'uid' zijn nodig om een gebruiker aan te maken"
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr "mislukt"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr "okee"
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr "status"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, fuzzy, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "Onbekende FAI status %s"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Informatie"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr "Er is niets te importeren!"
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 #, fuzzy
 msgid "Cannot find CSV data in the selected file!"
 msgstr "Kan bestand '%s' niet aanmaken."
@@ -559,6 +537,35 @@ msgstr "Kan bestand '%s' niet aanmaken."
 msgid "CSV import"
 msgstr "CSV import"
 
+#: addons/ldapmanager/class_export.inc:70
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "U heeft geen toestemming om LDAP gegevens te exporteren."
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#, fuzzy
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
+
+#, fuzzy
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "Controleer parameter"
+
+#~ msgid "Click here to save the complete LDAP database to a file"
+#~ msgstr "Klik hier om de complete LDAP database op te slaan in een bestand."
+
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "Klik hier om de LDAP export op te slaan in een bestand."
+
 #, fuzzy
 #~ msgid "Ldap manger"
 #~ msgstr "LDAP beheer"
diff --git a/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po
index 50cbe89da..47a289536 100644
--- a/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -14,25 +15,6 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-#, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
-
-#: html/getldif.php:82
-#, fuzzy
-msgid "You have no permission to create LDAP dumps!"
-msgstr "Brak uprawnień do usunięcia tego departamentu."
-
-#: html/getldif.php:107
-#, fuzzy
-msgid "Error in ivbb parameter!"
-msgstr "Parametr kernela"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr "Urodziny"
@@ -232,7 +214,15 @@ msgstr "Pełne"
 msgid "Computers of %s on %s"
 msgstr "Komputery %s na %s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+#, fuzzy
+msgid "Permission error"
+msgstr "Uprawnienia"
+
+#: html/getxls.php:478
 #, fuzzy
 msgid "You have no permission to do LDAP exports!"
 msgstr "Brak uprawnień do wysyłania wiadomości!"
@@ -258,47 +248,49 @@ msgstr ""
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr "Błąd"
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, fuzzy, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Nie można stworzyć pliku '%s'."
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 #, fuzzy
 msgid "file is empty"
 msgstr "Wybrany plik jest pusty"
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 #, fuzzy
 msgid "file not found"
 msgstr "Właściciel pliku"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -366,7 +358,7 @@ msgstr ""
 "jalo xls. Można zapisać te pliki dla dokumentacji."
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "Eksportuj pojedynczy wpis"
 
@@ -377,9 +369,8 @@ msgstr "Wybierz dane które chcesz eksportować"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Export"
 
@@ -389,18 +380,14 @@ msgstr "Eksportuj kompletny XLS dla"
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Wybierz departament, który chcesz eksportować"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr "Eksportuj IVBB LDIF dla"
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr "Eksport zakończony powodzeniem"
 
@@ -432,7 +419,7 @@ msgstr "Import"
 msgid "export"
 msgstr "Export"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -446,36 +433,27 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr "Eksportuj kompletny LDIF dla"
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Kliknij tutaj aby zapisać kompletną bazę LDAP do pliku"
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Kliknij tutaj aby zapisać Eksport LDAP"
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr "Import XLS"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 #, fuzzy
 msgid "Cannot export selected entries!"
 msgstr "Utwórz obiekty"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, fuzzy, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "Brak uprawnień do eksportowania bazy LDAP."
 
 #: addons/ldapmanager/contentcsv.tpl:2
+#, fuzzy
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 "Dodatek imoprt CSV zapewnia metody do wygenerowania kont użytkowników z "
 "pliku zawierającego wartości oddzielone przecinkami. Administrator może "
@@ -516,32 +494,32 @@ msgstr "Brak uprawnień do wykonania importu CSV."
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr "Potrzeba 'sn', 'givenName' oraz 'uid' do utworzenia użytkownika."
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr "błąd"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr "ok"
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr "status"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, fuzzy, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Informacja"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr "Nic do importowania!"
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 #, fuzzy
 msgid "Cannot find CSV data in the selected file!"
 msgstr "Nie można stworzyć pliku '%s'."
@@ -550,6 +528,35 @@ msgstr "Nie można stworzyć pliku '%s'."
 msgid "CSV import"
 msgstr "import CVS"
 
+#: addons/ldapmanager/class_export.inc:70
+#, php-format
+msgid "No such object %s!"
+msgstr ""
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "Brak uprawnień do eksportowania bazy LDAP."
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#, fuzzy
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr "Brak uprawnień do usunięcia tego departamentu."
+
+#, fuzzy
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "Parametr kernela"
+
+#~ msgid "Click here to save the complete LDAP database to a file"
+#~ msgstr "Kliknij tutaj aby zapisać kompletną bazę LDAP do pliku"
+
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "Kliknij tutaj aby zapisać Eksport LDAP"
+
 #, fuzzy
 #~ msgid "Ldap manger"
 #~ msgstr "Menedżer LDAP"
diff --git a/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po
index 5d2377fea..a1ecff4a7 100644
--- a/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/ru/LC_MESSAGES/messages.po
@@ -5,34 +5,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-#, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
-
-#: html/getldif.php:82
-#, fuzzy
-msgid "You have no permission to create LDAP dumps!"
-msgstr "У вас недостаточно прав для удаления этого подразделения."
-
-#: html/getldif.php:107
-#, fuzzy
-msgid "Error in ivbb parameter!"
-msgstr "Изменить параметры"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr ""
@@ -248,7 +230,15 @@ msgstr ""
 msgid "Computers of %s on %s"
 msgstr "не полный"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+#, fuzzy
+msgid "Permission error"
+msgstr "Права для членов группы"
+
+#: html/getxls.php:478
 #, fuzzy
 msgid "You have no permission to do LDAP exports!"
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
@@ -274,47 +264,49 @@ msgstr ""
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, fuzzy, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "Удалить"
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 #, fuzzy
 msgid "file is empty"
 msgstr "Значение поля \"Файлы\" некорректно."
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 #, fuzzy
 msgid "file not found"
 msgstr "Имя сервера"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -385,7 +377,7 @@ msgstr ""
 "использовать при инициализации нового сервера."
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "Экспорт объекта"
 
@@ -397,9 +389,8 @@ msgstr "Выбрать подразделение для экспорта"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "Экспорт"
 
@@ -409,18 +400,14 @@ msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "Выбрать подразделение для экспорта"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr ""
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 #, fuzzy
 msgid "Export successful"
 msgstr "Экспорт успешен."
@@ -456,7 +443,7 @@ msgstr "Импортировать"
 msgid "export"
 msgstr "Экспорт"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 #, fuzzy
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
@@ -471,27 +458,17 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr ""
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Щелкните здесь, чтобы сохранить образ базы данных LDAP в файл"
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Щелкните здесь, чтобы сохранить результаты экспорта"
-
 #: addons/ldapmanager/class_exportxls.inc:6
 #, fuzzy
 msgid "XLS import"
 msgstr "Импортировать"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 #, fuzzy
 msgid "Cannot export selected entries!"
 msgstr "Включаемые объекты"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, fuzzy, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "У вас недостаточно прав для удаления этого подразделения."
@@ -501,7 +478,7 @@ msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 
 #: addons/ldapmanager/contentcsv.tpl:10
@@ -539,34 +516,34 @@ msgstr "У вас недостаточно прав для удаления эт
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 #, fuzzy
 msgid "failed"
 msgstr "Ошибка"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 #, fuzzy
 msgid "status"
 msgstr "Состояние"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, fuzzy, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "состояние неизвестно"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "Информация"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr ""
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 #, fuzzy
 msgid "Cannot find CSV data in the selected file!"
 msgstr "Удалить"
@@ -576,6 +553,35 @@ msgstr "Удалить"
 msgid "CSV import"
 msgstr "Импортировать"
 
+#: addons/ldapmanager/class_export.inc:70
+#, fuzzy, php-format
+msgid "No such object %s!"
+msgstr "Включаемые объекты"
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "У вас недостаточно прав для удаления этого подразделения."
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#, fuzzy
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr "У вас недостаточно прав для удаления этого подразделения."
+
+#, fuzzy
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "Изменить параметры"
+
+#~ msgid "Click here to save the complete LDAP database to a file"
+#~ msgstr "Щелкните здесь, чтобы сохранить образ базы данных LDAP в файл"
+
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "Щелкните здесь, чтобы сохранить результаты экспорта"
+
 #, fuzzy
 #~ msgid "Ldap manger"
 #~ msgstr "Экспорт в LDIF"
diff --git a/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po
index b0a30eaa4..0054a9440 100644
--- a/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ldapmanager/locale/zh/LC_MESSAGES/messages.po
@@ -7,34 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: html/getldif.php:82 html/getxls.php:493
-#: addons/ldapmanager/class_import.inc:52
-#: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_csvimport.inc:105
-#: addons/ldapmanager/class_export.inc:96
-#, fuzzy
-msgid "Permission error"
-msgstr "允许"
-
-#: html/getldif.php:82
-#, fuzzy
-msgid "You have no permission to create LDAP dumps!"
-msgstr "您无权删除这个部门。"
-
-#: html/getldif.php:107
-#, fuzzy
-msgid "Error in ivbb parameter!"
-msgstr "检查参数"
-
 #: html/getxls.php:88
 msgid "Birthday"
 msgstr "生日"
@@ -234,7 +216,15 @@ msgstr "全部"
 msgid "Computers of %s on %s"
 msgstr "%s计算机于%s"
 
-#: html/getxls.php:493
+#: html/getxls.php:478 addons/ldapmanager/class_import.inc:52
+#: addons/ldapmanager/class_exportxls.inc:106
+#: addons/ldapmanager/class_csvimport.inc:105
+#: addons/ldapmanager/class_export.inc:86
+#, fuzzy
+msgid "Permission error"
+msgstr "允许"
+
+#: html/getxls.php:478
 #, fuzzy
 msgid "You have no permission to do LDAP exports!"
 msgstr "您无权查看和编辑 ACL。"
@@ -262,47 +252,49 @@ msgstr "您无权执行这个方法！"
 #: addons/ldapmanager/class_import.inc:76
 #: addons/ldapmanager/class_exportxls.inc:93
 #: addons/ldapmanager/class_csvimport.inc:165
-#: addons/ldapmanager/class_csvimport.inc:285
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
-#: addons/ldapmanager/class_csvimport.inc:494
-#: addons/ldapmanager/class_export.inc:84
+#: addons/ldapmanager/class_csvimport.inc:282
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
+#: addons/ldapmanager/class_csvimport.inc:491
+#: addons/ldapmanager/class_export.inc:42
+#: addons/ldapmanager/class_export.inc:92
 msgid "Error"
 msgstr "错误"
 
 #: addons/ldapmanager/class_import.inc:61
 #: addons/ldapmanager/class_import.inc:68
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:340
-#: addons/ldapmanager/class_csvimport.inc:346
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:337
+#: addons/ldapmanager/class_csvimport.inc:343
+#: addons/ldapmanager/class_csvimport.inc:348
 #, fuzzy, php-format
 msgid "Cannot read uploaded file: %s"
 msgstr "无法创建文件 '%s'。"
 
 #: addons/ldapmanager/class_import.inc:61
-#: addons/ldapmanager/class_csvimport.inc:340
+#: addons/ldapmanager/class_csvimport.inc:337
 #, fuzzy
 msgid "file is empty"
 msgstr "选择的文件为空。"
 
 #: addons/ldapmanager/class_import.inc:68
-#: addons/ldapmanager/class_csvimport.inc:335
-#: addons/ldapmanager/class_csvimport.inc:346
+#: addons/ldapmanager/class_csvimport.inc:332
+#: addons/ldapmanager/class_csvimport.inc:343
 #, fuzzy
 msgid "file not found"
 msgstr "文件"
 
 #: addons/ldapmanager/class_import.inc:76
-#: addons/ldapmanager/class_csvimport.inc:351
+#: addons/ldapmanager/class_csvimport.inc:348
 msgid "file not readable"
 msgstr ""
 
 #: addons/ldapmanager/class_import.inc:110
 #: addons/ldapmanager/class_import.inc:114
+#: addons/ldapmanager/class_export.inc:69
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -369,7 +361,7 @@ msgstr ""
 "文件用于文档。"
 
 #: addons/ldapmanager/contentexportxls.tpl:10
-#: addons/ldapmanager/contentexport.tpl:10
+#: addons/ldapmanager/contentexport.tpl:9
 msgid "Export single entry"
 msgstr "导出单条记录"
 
@@ -380,9 +372,8 @@ msgstr "选择您要导出的数据"
 #: addons/ldapmanager/contentexportxls.tpl:19
 #: addons/ldapmanager/contentexportxls.tpl:32
 #: addons/ldapmanager/contentexportxls.tpl:47
-#: addons/ldapmanager/contentexport.tpl:16
-#: addons/ldapmanager/contentexport.tpl:29
-#: addons/ldapmanager/contentexport.tpl:44
+#: addons/ldapmanager/contentexport.tpl:15
+#: addons/ldapmanager/contentexport.tpl:27
 msgid "Export"
 msgstr "导出"
 
@@ -392,18 +383,14 @@ msgstr "导出整个 XLS"
 
 #: addons/ldapmanager/contentexportxls.tpl:27
 #: addons/ldapmanager/contentexportxls.tpl:42
-#: addons/ldapmanager/contentexport.tpl:24
-#: addons/ldapmanager/contentexport.tpl:39
 msgid "Choose the department you want to Export"
 msgstr "选择要导出的部门"
 
 #: addons/ldapmanager/contentexportxls.tpl:39
-#: addons/ldapmanager/contentexport.tpl:36
 msgid "Export IVBB LDIF for"
 msgstr "导出 IVBB LDIF"
 
 #: addons/ldapmanager/contentexportxls.tpl:58
-#: addons/ldapmanager/contentexport.tpl:55
 msgid "Export successful"
 msgstr "导出成功"
 
@@ -435,7 +422,7 @@ msgstr "导入"
 msgid "export"
 msgstr "导出"
 
-#: addons/ldapmanager/contentexport.tpl:3
+#: addons/ldapmanager/contentexport.tpl:2
 msgid ""
 "The LDIF export plugin provides methods to download a complete snapshot of "
 "the running LDAP directory as ldif. You may save these files for backup "
@@ -448,36 +435,27 @@ msgstr ""
 msgid "Export complete LDIF for"
 msgstr "导出整个 LDIF "
 
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "点击这里保存整个 LDAP 数据库到一个文件"
-
-#: addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "点击这里保存 LDAP 导出"
-
 #: addons/ldapmanager/class_exportxls.inc:6
 msgid "XLS import"
 msgstr "导入 XLS"
 
 #: addons/ldapmanager/class_exportxls.inc:93
-#: addons/ldapmanager/class_export.inc:84
 #, fuzzy
 msgid "Cannot export selected entries!"
 msgstr "选择要添加的对象"
 
 #: addons/ldapmanager/class_exportxls.inc:106
-#: addons/ldapmanager/class_export.inc:96
 #, fuzzy, php-format
 msgid "You have no permission to export '%s'!"
 msgstr "您无权进行 LDAP 导出。"
 
 #: addons/ldapmanager/contentcsv.tpl:2
+#, fuzzy
 msgid ""
 "The CSV import plugin provides methods to generate user accounts from a file "
 "containing Comma Seperated Values. The administrator can decide which "
 "columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+"least the UID, GIVENNAME and SURNAME set."
 msgstr ""
 "该 CVS 导入插件提供一个从逗号分隔格式文件创建用户账号的功能。管理员可以决定哪"
 "一个列被导入到哪一个属性。注意必须包含 UID, GIVENNAME 和 SURENAME 字段"
@@ -516,32 +494,32 @@ msgstr "您无权执行 CSV 导入。"
 msgid "Need at least 'sn', 'givenName' and 'uid' to create users."
 msgstr "需要 'sn', 'givenName' 和 'uid' 来创建用户。"
 
-#: addons/ldapmanager/class_csvimport.inc:213
+#: addons/ldapmanager/class_csvimport.inc:210
 msgid "failed"
 msgstr "失败"
 
-#: addons/ldapmanager/class_csvimport.inc:217
+#: addons/ldapmanager/class_csvimport.inc:214
 msgid "ok"
 msgstr "ok"
 
-#: addons/ldapmanager/class_csvimport.inc:281
+#: addons/ldapmanager/class_csvimport.inc:278
 msgid "status"
 msgstr "状态"
 
-#: addons/ldapmanager/class_csvimport.inc:285
+#: addons/ldapmanager/class_csvimport.inc:282
 #, fuzzy, php-format
 msgid "Cannot insert entry '%s'!"
 msgstr "未知 FAIstate %s"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Information"
 msgstr "提示信息"
 
-#: addons/ldapmanager/class_csvimport.inc:323
+#: addons/ldapmanager/class_csvimport.inc:320
 msgid "Nothing to import!"
 msgstr "没有数据导入！"
 
-#: addons/ldapmanager/class_csvimport.inc:494
+#: addons/ldapmanager/class_csvimport.inc:491
 #, fuzzy
 msgid "Cannot find CSV data in the selected file!"
 msgstr "无法创建文件 '%s'。"
@@ -550,6 +528,35 @@ msgstr "无法创建文件 '%s'。"
 msgid "CSV import"
 msgstr "CSV 导入"
 
+#: addons/ldapmanager/class_export.inc:70
+#, fuzzy, php-format
+msgid "No such object %s!"
+msgstr "成员对象"
+
+#: addons/ldapmanager/class_export.inc:87
+#, fuzzy, php-format
+msgid "You have no permission to export %s!"
+msgstr "您无权进行 LDAP 导出。"
+
+#: addons/ldapmanager/class_export.inc:93
+#, php-format
+msgid "Failed to generate ldap export, error was '%s'!"
+msgstr ""
+
+#, fuzzy
+#~ msgid "You have no permission to create LDAP dumps!"
+#~ msgstr "您无权删除这个部门。"
+
+#, fuzzy
+#~ msgid "Error in ivbb parameter!"
+#~ msgstr "检查参数"
+
+#~ msgid "Click here to save the complete LDAP database to a file"
+#~ msgstr "点击这里保存整个 LDAP 数据库到一个文件"
+
+#~ msgid "Click here to save the LDAP Export "
+#~ msgstr "点击这里保存 LDAP 导出"
+
 #, fuzzy
 #~ msgid "Ldap manger"
 #~ msgstr "LDAP 管理"
diff --git a/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po
index 06823c3ca..9587194b7 100644
--- a/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 14:22+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po
index c14c95faa..f6d279f03 100644
--- a/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-28 23:48+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po
index dabe47a32..bf9ad0d2c 100644
--- a/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-22 21:07+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po
index 58fa5f086..92b1add46 100644
--- a/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/messages.po b/gosa-plugins/log/locale/messages.po
index 69b1678a4..116bfd758 100644
--- a/gosa-plugins/log/locale/messages.po
+++ b/gosa-plugins/log/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po
index e9a964e67..f7cb0db13 100644
--- a/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po
index 8f61fd87a..9cbe5b1de 100644
--- a/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po
index 29be18c1a..168ef4a2b 100644
--- a/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po
index 54a3a1206..3330573b5 100644
--- a/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/log/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
index 95ca54fdf..9d03de416 100644
--- a/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-12-19 09:04+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,10 +49,10 @@ msgstr "Neues Mail-Konto erzeugen"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "Mail-Adresse"
@@ -68,8 +69,8 @@ msgstr "Ihr-Name@ihre-domain.com"
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -89,9 +90,9 @@ msgstr "LDAP-Fehler"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "Mail"
 
@@ -105,7 +106,7 @@ msgstr "Mail-Verteilerliste"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Primäre Adresse"
@@ -135,11 +136,11 @@ msgstr "Bitte geben Sie eine Mail-Adresse ein"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 msgid "Mail error"
 msgstr "Mail-Fehler"
 
@@ -169,8 +170,8 @@ msgstr "Kann Ordner-Berechtigungen nicht ermitteln: %s"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Mail-Methode kann nicht verbinden: %s"
@@ -233,20 +234,20 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "Die Adresse wird bereits von der Gruppe '%s' verwendet."
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Die Adresse wird bereits von Benutzer '%s' verwendet."
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kann das Postfach nicht entfernen: %s"
@@ -262,13 +263,13 @@ msgid "New"
 msgstr "Neu"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kann das Postfach nicht aktualisieren: '%s'"
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Kann Kontingent-Einstellungen nicht sichern: %s"
@@ -284,14 +285,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Kontingent-Größe"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 msgid "Mail max size"
 msgstr "Maximale Mailgröße"
 
@@ -301,7 +302,7 @@ msgstr "Sie müssen die maximale Mail-Größe angeben, um Mails abzuweisen."
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr "Mail-Server"
 
@@ -356,12 +357,12 @@ msgid "Reload"
 msgstr "Aktualisieren"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "Alternative Adressen"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer Mail-Adressen"
 
@@ -412,7 +413,7 @@ msgid "Not used in all groups"
 msgstr "Nicht verwendet in allen Gruppen"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Lokale hinzufügen"
 
@@ -460,7 +461,7 @@ msgstr "Wählen Sie eine bestimmte Abteilung"
 msgid "Choose"
 msgstr "Wählen"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
@@ -915,6 +916,7 @@ msgid "Enabled bayes auto learning"
 msgstr "Bayes lernt automatisch"
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Name"
@@ -1135,7 +1137,7 @@ msgstr "Kopfzeilen"
 msgid "Display header of this message"
 msgstr "Zeige Kopfzeilen dieser Nachricht"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Eigenes Sieve-Skript verwenden"
 
@@ -1168,8 +1170,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Urlaubsbenachrichtigung aktivieren"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 msgid "from"
 msgstr "von"
 
@@ -1207,7 +1209,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Urlaubsbenachrichtigung"
 
@@ -1217,7 +1219,7 @@ msgstr "Urlaubsbenachrichtigung"
 msgid "Import"
 msgstr "Importieren"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "Nachrichten weiterleiten an"
 
@@ -2153,8 +2155,8 @@ msgid "User mail settings"
 msgstr "Benutzer Mail-Einstellungen"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -2182,73 +2184,73 @@ msgstr "Sie haben keine Berechtigung, diese Adressen zu verändern!"
 msgid "unknown"
 msgstr "unbekannt"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 msgid "Mail error saving sieve settings"
 msgstr "Fehler beim Speichern der Sieve-Einstellungen"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 msgid "Mail reject size"
 msgstr "Maximale Mailgröße"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 msgid "Spam folder"
 msgstr "Ordner für Spam"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 msgid "to"
 msgstr "an"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 msgid "Vacation interval"
 msgstr "Urlaubsbenachrichtigungs-Intervall"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 msgid "Add vacation information"
 msgstr "Urlaubsinformationen hinzufügen"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr "Verwende Spam-Filter"
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 msgid "Spam level"
 msgstr "Spam-Level"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr "Spam-Postfach"
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 msgid "Sieve management"
 msgstr "Sieve Verwaltung"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 msgid "Reject due to mailsize"
 msgstr "Aufgrund der Mail-Größe abweisen"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 msgid "Forwarding address"
 msgstr "Weiterleitungs-Adresse"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 msgid "Local delivery"
 msgstr "Lokale Zustellung"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 msgid "No delivery to own mailbox "
 msgstr "Keine Zustellung in eigenes Postfach"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 msgid "Mail alternative addresses"
 msgstr "Weitere Adressen"
 
@@ -2261,14 +2263,12 @@ msgid "Filter"
 msgstr "Filter"
 
 #: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:11
-#, fuzzy
 msgid "Show users"
-msgstr "Zeige Mail Benutzer"
+msgstr "Zeige Benutzer"
 
 #: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:12
-#, fuzzy
 msgid "Show groups"
-msgstr "Zeige Mail Gruppen"
+msgstr "Zeige Gruppen"
 
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:10
 msgid "Please select the desired entries"
@@ -2282,26 +2282,26 @@ msgstr "Benutzer"
 msgid "Group"
 msgstr "Gruppe"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "Das eingestellte Mail-Attribut '%s' wird nicht unterstützt!"
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr "Mail-Methode '%s' ist unbekannt!"
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 msgid "None"
 msgstr "Keine"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 msgid "Unlimited"
 msgstr "Ohne Beschränkung"
 
diff --git a/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
index 2c81c6b73..c48d17eff 100644
--- a/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-28 23:51+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,10 +46,10 @@ msgstr "Crear cuenta de correo"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
@@ -65,8 +66,8 @@ msgstr "your-name@your-domain.com"
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -86,9 +87,9 @@ msgstr "Error LDAP"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "Correo Electrónico"
 
@@ -102,7 +103,7 @@ msgstr "Lista de distribución de correo"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Cuenta Principal"
@@ -132,11 +133,11 @@ msgstr "Por favor introduzca una dirección de correo"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 msgid "Mail error"
 msgstr "Error de correo"
 
@@ -166,8 +167,8 @@ msgstr "No se puede recibir los permisos de carpetas: '%s'"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "El método de correo no puede conectar: %s"
@@ -231,19 +232,21 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018, php-format
+#: personal/mail/class_mailAccount.inc:1032
+#, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "La dirección de correo ya esta usada por el grupo '%s'"
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "¡La dirección de correo ya esta usada por el usuario '%s'!"
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830, php-format
+#: personal/mail/class_mailAccount.inc:844
+#, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "No se puede eliminar el buzón de correo: 's'"
 
@@ -258,13 +261,13 @@ msgid "New"
 msgstr "Nuevo"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "No puedo actualizar el buzón de correo: %s"
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "No puedo guardar el parámetro de cuota: %s"
@@ -280,14 +283,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Tamaño de cuota"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 msgid "Mail max size"
 msgstr "Tamaño máximo del mensaje"
 
@@ -299,7 +302,7 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr "Servidor de correo"
 
@@ -354,12 +357,12 @@ msgid "Reload"
 msgstr "Recargar"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
@@ -411,7 +414,7 @@ msgid "Not used in all groups"
 msgstr "No usado en todos los grupos"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Añadir Cuenta Local"
 
@@ -459,7 +462,7 @@ msgstr "Seleccionar un departamento especifico"
 msgid "Choose"
 msgstr "Elige"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Parámetros de correo"
@@ -911,6 +914,7 @@ msgid "Enabled bayes auto learning"
 msgstr "Activar autoaprendizaje de filtros bayesianos"
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Nombre"
@@ -1133,7 +1137,7 @@ msgstr "cabecera"
 msgid "Display header of this message"
 msgstr "Mostrar cabecera de este mensaje"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Usar 'script Sieve' propios"
 
@@ -1164,8 +1168,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 msgid "from"
 msgstr "desde"
 
@@ -1203,7 +1207,7 @@ msgstr "Mb"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
@@ -1213,7 +1217,7 @@ msgstr "Mensaje de ausencia"
 msgid "Import"
 msgstr "Importar"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
@@ -2148,8 +2152,8 @@ msgid "User mail settings"
 msgstr "Parametros del correo del usuario"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 msgid "Configuration error"
 msgstr "Error en la configuración"
 
@@ -2177,73 +2181,73 @@ msgstr "¡No tiene permisos para eliminar estas direcciones!"
 msgid "unknown"
 msgstr "desconocido"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 msgid "Mail error saving sieve settings"
 msgstr "Hay un error de correo al grabar la configuración sieve"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 msgid "Mail reject size"
 msgstr "Tamaño de correo desestimado"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 msgid "Spam folder"
 msgstr "Carpeta de SPAM"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 msgid "to"
 msgstr "a"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 msgid "Vacation interval"
 msgstr "Intervalo de ausencia"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 msgid "Add vacation information"
 msgstr "Añadir información de ausencia"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr "Usar filtro antispam"
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 msgid "Spam level"
 msgstr "Nivel de spam"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr "Tamaño de la carpeta de spam"
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 msgid "Sieve management"
 msgstr "Administración Sieve"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 msgid "Reject due to mailsize"
 msgstr "rechazar correos mayores que"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 msgid "Forwarding address"
 msgstr "Direcciones de reenvío"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 msgid "No delivery to own mailbox "
 msgstr "No recibir en su propia cuenta"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 msgid "Mail alternative addresses"
 msgstr "Direcciones alternativas"
 
@@ -2275,26 +2279,26 @@ msgstr "Usuario"
 msgid "Group"
 msgstr "Grupo"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "¡El atributo '%s' configurado en el correo no esta soportado!"
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr "¡El método de correo '%s' es desconocido!"
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 msgid "None"
 msgstr "Ninguno"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 msgid "Unlimited"
 msgstr "Sin limite"
 
diff --git a/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
index aa996263f..6072a4637 100644
--- a/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-28 22:26+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,10 +42,10 @@ msgstr "Créer un compte de messagerie"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "Adresse de messagerie"
@@ -61,8 +62,8 @@ msgstr "votre-nom@votre-domaine.com"
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -82,9 +83,9 @@ msgstr "Erreur LDAP"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "Messagerie"
 
@@ -98,7 +99,7 @@ msgstr "Liste de distribution"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Adresse principale"
@@ -128,11 +129,11 @@ msgstr "Veuillez entrer une adresse de messagerie"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 msgid "Mail error"
 msgstr "Erreur du serveur de messagerie"
 
@@ -162,8 +163,8 @@ msgstr "Impossible d'obtenir les permissions du dossier : %s"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr "Le méthode mail ne peut pas se connecter : %s"
@@ -172,7 +173,8 @@ msgstr "Le méthode mail ne peut pas se connecter : %s"
 #: personal/mail/class_mailAccount.inc:161
 #, php-format
 msgid "Mailbox '%s' doesn't exists on mail server: %s"
-msgstr "Le compte de messagerie '%s' n'existe pas sur le serveur de messagerie : %s"
+msgstr ""
+"Le compte de messagerie '%s' n'existe pas sur le serveur de messagerie : %s"
 
 #: admin/groups/mail/class_groupMail.inc:306
 msgid ""
@@ -228,20 +230,20 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "L'adresse entrée est déjà utilisée par le groupe '%s'."
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "L'adresse entrée est déjà utilisée par l'utilisateur '%s'."
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Impossible de supprimer le compte de messagerie : %s"
@@ -257,13 +259,13 @@ msgid "New"
 msgstr "Nouveau"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Impossible de mettre à jour le compte de messagerie : %s"
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Impossible d'écrire les quotas : %s"
@@ -279,14 +281,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Taille du Quota"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 msgid "Mail max size"
 msgstr "Taille maximale du message"
 
@@ -298,7 +300,7 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr "Serveur de messagerie"
 
@@ -353,12 +355,12 @@ msgid "Reload"
 msgstr "Recharger"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "Adresses alternatives"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Liste des adresses de messagerie alternatives"
 
@@ -411,7 +413,7 @@ msgid "Not used in all groups"
 msgstr "Pas utilisé dans tout les groupes"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Ajouter en local"
 
@@ -459,7 +461,7 @@ msgstr "Sélectionner un département"
 msgid "Choose"
 msgstr "Choisir"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
@@ -854,7 +856,8 @@ msgstr "Score requis"
 
 #: admin/systems/services/spam/goSpamServer.tpl:22
 msgid "Select required score to tag mail as spam"
-msgstr "Sélectionner le score requis pour marquer ce message comme étant un spam"
+msgstr ""
+"Sélectionner le score requis pour marquer ce message comme étant un spam"
 
 #: admin/systems/services/spam/goSpamServer.tpl:69
 #: admin/systems/services/spam/class_goSpamServer.inc:334
@@ -913,6 +916,7 @@ msgid "Enabled bayes auto learning"
 msgstr "Activer l'apprentissage automatique pour la méthode bayesienne"
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Nom"
@@ -1132,7 +1136,7 @@ msgstr "entête"
 msgid "Display header of this message"
 msgstr "Afficher l'entête de ce message"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Utiliser des scripts sieve personnalisés"
 
@@ -1155,7 +1159,8 @@ msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
 #: personal/mail/generic.tpl:151
-msgid "Select to automatically response with the vacation message defined below"
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 "Indiquez la réponse automatique en remplissant le message d'absence ci-"
 "dessous"
@@ -1164,8 +1169,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Activer la notification d'absence"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 msgid "from"
 msgstr "de"
 
@@ -1204,7 +1209,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Message d'absence"
 
@@ -1214,7 +1219,7 @@ msgstr "Message d'absence"
 msgid "Import"
 msgstr "Importer"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "Transférer les messages vers"
 
@@ -1729,7 +1734,8 @@ msgstr ""
 "d'authentification est vide."
 
 #: personal/mail/sieve/templates/management.tpl:6
-msgid "Please verify that the attributes uid and mail are not empty and try again."
+msgid ""
+"Please verify that the attributes uid and mail are not empty and try again."
 msgstr ""
 "Veuillez vérifier que les attributs uid et mail ne sont pas vide et "
 "réessayer."
@@ -1939,11 +1945,14 @@ msgid "Please specify a valid operator."
 msgstr "Veuillez spécifier un opérateur valide."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:654
-msgid "Invalid character found in address attribute. Quotes are not allowed here."
-msgstr "Caractère non valide dans l'adresse. Les guillemets sont interdits ici."
+msgid ""
+"Invalid character found in address attribute. Quotes are not allowed here."
+msgstr ""
+"Caractère non valide dans l'adresse. Les guillemets sont interdits ici."
 
 #: personal/mail/sieve/class_sieveElement_If.inc:669
-msgid "Invalid character found in value attribute. Quotes are not allowed here."
+msgid ""
+"Invalid character found in value attribute. Quotes are not allowed here."
 msgstr ""
 "Caractère non valide trouvé dans l'attribut. Les guillemets ne sont pas "
 "permis ici."
@@ -2027,7 +2036,8 @@ msgstr "L'analyse à réussi"
 
 #: personal/mail/sieve/class_sieveManagement.inc:156
 #, php-format
-msgid "The specified mail server '%s' does not exist within the GOsa configuration."
+msgid ""
+"The specified mail server '%s' does not exist within the GOsa configuration."
 msgstr ""
 "Le serveur de messagerie spécifié '%s' n'existe pas dans la configuration de "
 "GOsa."
@@ -2042,7 +2052,8 @@ msgstr "Veuillez seulement utiliser des nom de script en miniscules !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:212
 msgid "Please use only alphabetical characters in script names!"
-msgstr "Seul des caractères alphabétiques sont permis dans le nom des scripts !"
+msgstr ""
+"Seul des caractères alphabétiques sont permis dans le nom des scripts !"
 
 #: personal/mail/sieve/class_sieveManagement.inc:218
 msgid "Script name already in use!"
@@ -2147,8 +2158,8 @@ msgid "User mail settings"
 msgstr "Configuration du compte de messagerie de l'utilisateur"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -2176,73 +2187,73 @@ msgstr "Vous n'avez pas les droits nécessaires pour modifier ces adresses !"
 msgid "unknown"
 msgstr "inconnu"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 msgid "Mail error saving sieve settings"
 msgstr "Erreur de messagerie lors de la sauvegarde du script sieve"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 msgid "Mail reject size"
 msgstr "Taille maximale autorisée du message"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 msgid "Spam folder"
 msgstr "Dossier spam"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 msgid "to"
 msgstr "vers"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 msgid "Vacation interval"
 msgstr "Intervalle du message d'absence"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 msgid "Add vacation information"
 msgstr "Ajouter un message d'absence"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr "Utiliser le filtre antispam"
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 msgid "Spam level"
 msgstr "Niveau de spam"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr "Boite spam de votre messagerie"
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 msgid "Sieve management"
 msgstr "Gestion de Sieve"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 msgid "Reject due to mailsize"
 msgstr "Rejeter a cause de la taille"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 msgid "Forwarding address"
 msgstr "Adresse de renvoi"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 msgid "Local delivery"
 msgstr "Distribution locale"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 msgid "No delivery to own mailbox "
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 msgid "Mail alternative addresses"
 msgstr "Adresses alternatives"
 
@@ -2274,30 +2285,29 @@ msgstr "Utilisateur"
 msgid "Group"
 msgstr "Groupes"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr "L'attribut de messagerie '%s' n'est pas supporté !"
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr "Le méthode de messagerie '%s' est inconnue !"
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 msgid "None"
 msgstr "Aucun"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 msgid "Unlimited"
 msgstr "Illimités"
 
 #: personal/mail/mail_locals.tpl:35
 msgid "Select department"
 msgstr "Sélectionner un département"
-
diff --git a/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
index 7f810adec..6681c707b 100644
--- a/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,10 +44,10 @@ msgstr "Crea estensioni di posta"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "Indirizzo principale"
@@ -63,8 +64,8 @@ msgstr ""
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -85,9 +86,9 @@ msgstr "Errore LDAP"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "Posta"
 
@@ -103,7 +104,7 @@ msgstr "Opzioni di posta dell'identità"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Indirizzo principale"
@@ -134,11 +135,11 @@ msgstr "Prego inserire un numero di telefono valido!"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy
 msgid "Mail error"
 msgstr "Server"
@@ -169,8 +170,8 @@ msgstr "Cartelle condivise IMAP"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -233,20 +234,20 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, fuzzy, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Rimuovi"
@@ -263,13 +264,13 @@ msgid "New"
 msgstr "Modifica contatto"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Rimuovi"
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Rimuovi"
@@ -283,14 +284,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Dimensione quota"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 #, fuzzy
 msgid "Mail max size"
 msgstr "Inoltra i messaggi a"
@@ -301,7 +302,7 @@ msgstr "Devi specificare la dimensione massima delle mail da rigettare."
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 #, fuzzy
 msgid "Mail server"
 msgstr "Server"
@@ -363,12 +364,12 @@ msgid "Reload"
 msgstr "leggere"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "Indirizzi alternativi"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Lista degli indirizzi alternativi"
 
@@ -423,7 +424,7 @@ msgid "Not used in all groups"
 msgstr "Mostra gruppi funzionali"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Aggiungi localmente"
 
@@ -471,7 +472,7 @@ msgstr "Selezione un dipartimento"
 msgid "Choose"
 msgstr "Scegli"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 #, fuzzy
 msgid "Mail settings"
@@ -956,6 +957,7 @@ msgid "Enabled bayes auto learning"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Cognome"
@@ -1202,7 +1204,7 @@ msgstr "leggere"
 msgid "Display header of this message"
 msgstr "Mostra utenti che corrispondono a"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Usa uno script di sieve personalizzato"
 
@@ -1233,8 +1235,8 @@ msgstr "Seleziona per rispondere automaticamente con il messaggio seguente"
 msgid "Activate vacation message"
 msgstr "Attiva la risposta automatica"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 #, fuzzy
 msgid "from"
 msgstr "e"
@@ -1274,7 +1276,7 @@ msgstr "Mb"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Messaggio di di risposta automatica"
 
@@ -1284,7 +1286,7 @@ msgstr "Messaggio di di risposta automatica"
 msgid "Import"
 msgstr "Importa"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "Inoltra i messaggi a"
 
@@ -2298,8 +2300,8 @@ msgid "User mail settings"
 msgstr "Opzioni di posta dell'identità"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
@@ -2330,84 +2332,84 @@ msgstr "Non hai il permesso di cambiare la tua password."
 msgid "unknown"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Usa uno script di sieve personalizzato"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Inoltra i messaggi a"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 #, fuzzy
 msgid "Spam folder"
 msgstr "nella cartella"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 #, fuzzy
 msgid "to"
 msgstr "Rapporto"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Messaggio di di risposta automatica"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Identità"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Informazioni organizzazione"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 #, fuzzy
 msgid "Sieve management"
 msgstr "Dirigenza"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Rifiuta mail più grandi di"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Indirizzo principale"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 #, fuzzy
 msgid "Local delivery"
 msgstr "Ultimo recapito"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Non recapitare nella propria mailbox"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Indirizzi alternativi"
@@ -2444,27 +2446,27 @@ msgstr ""
 msgid "Group"
 msgstr "Gruppo"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 #, fuzzy
 msgid "None"
 msgstr "nessuno"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 #, fuzzy
 msgid "Unlimited"
 msgstr "non definito"
diff --git a/gosa-plugins/mail/locale/messages.po b/gosa-plugins/mail/locale/messages.po
index 38278c632..f341144e2 100644
--- a/gosa-plugins/mail/locale/messages.po
+++ b/gosa-plugins/mail/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,10 +44,10 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr ""
@@ -63,8 +64,8 @@ msgstr ""
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 msgid "LDAP error"
 msgstr ""
 
@@ -84,9 +85,9 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr ""
 
@@ -100,7 +101,7 @@ msgstr ""
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr ""
@@ -130,11 +131,11 @@ msgstr ""
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 msgid "Mail error"
 msgstr ""
 
@@ -164,8 +165,8 @@ msgstr ""
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -224,20 +225,20 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, php-format
 msgid "Address is already in use by group '%s'."
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, php-format
 msgid "Address is already in use by user '%s'."
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr ""
@@ -253,13 +254,13 @@ msgid "New"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, php-format
 msgid "Cannot update mailbox: %s"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, php-format
 msgid "Cannot write quota settings: %s"
 msgstr ""
@@ -273,14 +274,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 msgid "Mail max size"
 msgstr ""
 
@@ -290,7 +291,7 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr ""
 
@@ -345,12 +346,12 @@ msgid "Reload"
 msgstr ""
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr ""
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr ""
 
@@ -399,7 +400,7 @@ msgid "Not used in all groups"
 msgstr ""
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr ""
 
@@ -447,7 +448,7 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr ""
@@ -897,6 +898,7 @@ msgid "Enabled bayes auto learning"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr ""
@@ -1116,7 +1118,7 @@ msgstr ""
 msgid "Display header of this message"
 msgstr ""
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr ""
 
@@ -1145,8 +1147,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr ""
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 msgid "from"
 msgstr ""
 
@@ -1183,7 +1185,7 @@ msgstr ""
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr ""
 
@@ -1193,7 +1195,7 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr ""
 
@@ -2100,8 +2102,8 @@ msgid "User mail settings"
 msgstr ""
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 msgid "Configuration error"
 msgstr ""
 
@@ -2129,73 +2131,73 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 msgid "Mail error saving sieve settings"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 msgid "Mail reject size"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 msgid "Spam folder"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 msgid "to"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 msgid "Vacation interval"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 msgid "Add vacation information"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 msgid "Spam level"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 msgid "Sieve management"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 msgid "Reject due to mailsize"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 msgid "Forwarding address"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 msgid "Local delivery"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 msgid "No delivery to own mailbox "
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 msgid "Mail alternative addresses"
 msgstr ""
 
@@ -2227,26 +2229,26 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 msgid "None"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 msgid "Unlimited"
 msgstr ""
 
diff --git a/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
index cf248fc75..bfb7d84da 100644
--- a/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,10 +48,10 @@ msgstr "E-mail account aanmaken"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "E-mail adres"
@@ -67,8 +68,8 @@ msgstr ""
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -89,9 +90,9 @@ msgstr "LDAP fout:"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "E-mail"
 
@@ -106,7 +107,7 @@ msgstr "Mail distributielijst"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Primair adres"
@@ -137,11 +138,11 @@ msgstr "Geef a.u.b. een geldige naam op"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy
 msgid "Mail error"
 msgstr "Mail server"
@@ -172,8 +173,8 @@ msgstr "IMAP gedeelde mappen"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -236,7 +237,7 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, fuzzy, php-format
 msgid "Address is already in use by group '%s'."
 msgstr ""
@@ -244,14 +245,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr ""
 "Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
@@ -268,13 +269,13 @@ msgid "New"
 msgstr "Gebruiker toevoegen"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Kan bestand '%s' niet aanmaken."
@@ -288,14 +289,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Quota grootte"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 #, fuzzy
 msgid "Mail max size"
 msgstr "E-mail grootte"
@@ -308,7 +309,7 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr "Mail server"
 
@@ -369,12 +370,12 @@ msgid "Reload"
 msgstr "Lezen"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "Alternatieve adressen"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Lijst met alternatieve E-mail adressen"
 
@@ -429,7 +430,7 @@ msgid "Not used in all groups"
 msgstr "Toon functionele groepen"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Lokaal toevoegen"
 
@@ -477,7 +478,7 @@ msgstr "Selecteer een specifieke afdeling"
 msgid "Choose"
 msgstr "Kies"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "E-mail instellingen"
@@ -967,6 +968,7 @@ msgid "Enabled bayes auto learning"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Naam"
@@ -1196,7 +1198,7 @@ msgstr "header"
 msgid "Display header of this message"
 msgstr "Toon de header van dit bericht"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Gebruik een eigen sieve script"
 
@@ -1228,8 +1230,8 @@ msgstr ""
 msgid "Activate vacation message"
 msgstr "Activeer afwezigheidsbericht"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
@@ -1268,7 +1270,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Afwezigheidsbericht"
 
@@ -1278,7 +1280,7 @@ msgstr "Afwezigheidsbericht"
 msgid "Import"
 msgstr "Importeren"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "Stuur berichten door naar"
 
@@ -2296,8 +2298,8 @@ msgid "User mail settings"
 msgstr "Gebruikers E-mail instellingen"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -2329,86 +2331,86 @@ msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
 msgid "unknown"
 msgstr "Onbekend"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Gebruik een eigen sieve script"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 #, fuzzy
 msgid "Mail reject size"
 msgstr "E-mail grootte"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 #, fuzzy
 msgid "Spam folder"
 msgstr "naar map"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Afwezigheidsbericht"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Organisatie informatie"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 #, fuzzy
 msgid "Spam level"
 msgstr "Log prioriteit"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 #, fuzzy
 msgid "Spam mail box"
 msgstr "E-mail grootte"
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 #, fuzzy
 msgid "Sieve management"
 msgstr "Beheer"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Wijs E-mail af indien groter dan"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Primair adres"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 #, fuzzy
 msgid "Local delivery"
 msgstr "Laatste levering"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Geen aflevering in eigen mailbox"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Alternatieve adressen"
@@ -2445,27 +2447,27 @@ msgstr "Gebruiker"
 msgid "Group"
 msgstr "Groep"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 #, fuzzy
 msgid "None"
 msgstr "geen"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 #, fuzzy
 msgid "Unlimited"
 msgstr "geen limiet"
diff --git a/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
index 9ee50a35e..94c5de7b6 100644
--- a/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,10 +43,10 @@ msgstr "Stwórz konto pocztowe"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "Adres email"
@@ -62,8 +63,8 @@ msgstr ""
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -84,9 +85,9 @@ msgstr "błąd LDAP:"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "Poczta"
 
@@ -100,7 +101,7 @@ msgstr "Pocztowa lista dystrybucyjna"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Adres podstawowy"
@@ -131,11 +132,11 @@ msgstr "Proszę podać prawidłową nazwę."
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy
 msgid "Mail error"
 msgstr "Serwer pocztowy"
@@ -166,8 +167,8 @@ msgstr "Współdzielone foldery IMAP"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -229,20 +230,20 @@ msgstr "Próbujesz dodać błędny adres email do listy przekazywanych."
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, fuzzy, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "Adres który próbujesz dodać jest już używany"
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Adres który próbujesz dodać jest już używany"
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
@@ -259,13 +260,13 @@ msgid "New"
 msgstr "Dodaj użytkownika"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Nie można stworzyć pliku '%s'."
@@ -279,14 +280,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Rozmiar Quoty"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 msgid "Mail max size"
 msgstr "Max rozmiar poczty"
 
@@ -296,7 +297,7 @@ msgstr "Należy ustawić maksymalny rozmiar poczty aby odrzucać cokolwiek."
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr "Serwer pocztowy"
 
@@ -354,12 +355,12 @@ msgid "Reload"
 msgstr "Odczyt"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "Adresy alternatywne"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Lista alternatywnych adresów pocztowych"
 
@@ -413,7 +414,7 @@ msgid "Not used in all groups"
 msgstr "Pokaż grupy funkcjonalne"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Dodaj lokalne"
 
@@ -461,7 +462,7 @@ msgstr "Wybierz departament"
 msgid "Choose"
 msgstr "Wybierz"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
@@ -934,6 +935,7 @@ msgid "Enabled bayes auto learning"
 msgstr "Włącz skanowanie antyfirusowe"
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Imię"
@@ -1162,7 +1164,7 @@ msgstr "nagłówek"
 msgid "Display header of this message"
 msgstr "Wyświetl nagłówek tej wiadomości"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Użyj własnego skryptu SIEVE"
 
@@ -1192,8 +1194,8 @@ msgstr "Zaznacz aby automatycznie wysyłać autoodpowiedź zdefiniowaną poniże
 msgid "Activate vacation message"
 msgstr "Włącz autoresponder"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 #, fuzzy
 msgid "from"
 msgstr "losowy"
@@ -1232,7 +1234,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Treść autorespondera"
 
@@ -1242,7 +1244,7 @@ msgstr "Treść autorespondera"
 msgid "Import"
 msgstr "Import"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "Przekaż wiadomości do"
 
@@ -2259,8 +2261,8 @@ msgid "User mail settings"
 msgstr "Ustawienia poczty użytkownika"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 #, fuzzy
 msgid "Configuration error"
 msgstr "Plik konfiguracyjny"
@@ -2292,79 +2294,79 @@ msgstr "Brak uprawnień do usunięcia tego departamentu."
 msgid "unknown"
 msgstr "Nieznane"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Użyj własnego skryptu SIEVE"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Max rozmiar poczty"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 #, fuzzy
 msgid "Spam folder"
 msgstr "do folferu"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 msgid "to"
 msgstr "do"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Treść autorespondera"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 msgid "Add vacation information"
 msgstr "Dodaj informacje autorespondera"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr "Użyj filtra spamu"
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 msgid "Spam level"
 msgstr "Poziom spamu"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr "Skrzynpa spamowa"
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 #, fuzzy
 msgid "Sieve management"
 msgstr "Zarządzanie"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 msgid "Reject due to mailsize"
 msgstr "Odrzuć z powodu rozmiaru wiadomości"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 msgid "Forwarding address"
 msgstr "Adresy przekazywane"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 msgid "Local delivery"
 msgstr "Lokalne dostarczanie"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Nie dostarczaj do własnej skrzynki"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 msgid "Mail alternative addresses"
 msgstr "Adresy alternatywne"
 
@@ -2400,27 +2402,27 @@ msgstr "Użytkownik"
 msgid "Group"
 msgstr "Grupa"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 #, fuzzy
 msgid "None"
 msgstr "żaden"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 #, fuzzy
 msgid "Unlimited"
 msgstr "bez limitu"
diff --git a/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
index edd9a54bc..f164fc078 100644
--- a/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,10 +43,10 @@ msgstr "Создать настройки запись эл. почты"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 #, fuzzy
 msgid "Mail address"
@@ -63,8 +64,8 @@ msgstr ""
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -85,9 +86,9 @@ msgstr "Ошибка LDAP:"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "Почта"
 
@@ -103,7 +104,7 @@ msgstr "Почтовые настройки пользователя"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "Основной адрес"
@@ -135,11 +136,11 @@ msgstr "Введите корректный серийный номер"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy
 msgid "Mail error"
 msgstr "Сервер"
@@ -170,8 +171,8 @@ msgstr "Общие папки IMAP"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -235,20 +236,20 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, fuzzy, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "Добавляемый вами адрес уже используется пользователем"
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
@@ -265,13 +266,13 @@ msgid "New"
 msgstr "Пользователи домена"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "Удалить"
@@ -285,14 +286,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Размер квоты"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 #, fuzzy
 msgid "Mail max size"
 msgstr "Размер квоты"
@@ -303,7 +304,7 @@ msgstr "Помните, что указывать нужно максималь
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 #, fuzzy
 msgid "Mail server"
 msgstr "Сервер"
@@ -366,13 +367,13 @@ msgid "Reload"
 msgstr "чтение"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 #, fuzzy
 msgid "Alternative addresses"
 msgstr "Альтернативные адреса"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
@@ -427,7 +428,7 @@ msgid "Not used in all groups"
 msgstr "Показать обычные группы"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "Добавить локально"
 
@@ -475,7 +476,7 @@ msgstr "Выберите подразделение."
 msgid "Choose"
 msgstr "Выбрать"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 #, fuzzy
 msgid "Mail settings"
@@ -971,6 +972,7 @@ msgid "Enabled bayes auto learning"
 msgstr ""
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "Фамилия"
@@ -1219,7 +1221,7 @@ msgstr "Отправитель"
 msgid "Display header of this message"
 msgstr "Показать совпадения номеров"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "Использовать другой сценарий SIEVE"
 
@@ -1249,8 +1251,8 @@ msgstr "Выберите, чтобы включить автоответчик 
 msgid "Activate vacation message"
 msgstr "Включить автоответчик"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 #, fuzzy
 msgid "from"
 msgstr "и"
@@ -1291,7 +1293,7 @@ msgstr "Мб"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "Сообщение автоответчика"
 
@@ -1301,7 +1303,7 @@ msgstr "Сообщение автоответчика"
 msgid "Import"
 msgstr "Импортировать"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "Перенаправлять сообщения"
 
@@ -2326,8 +2328,8 @@ msgid "User mail settings"
 msgstr "Почтовые настройки пользователя"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
@@ -2359,86 +2361,86 @@ msgstr "У вас недостаточно прав для удаления эт
 msgid "unknown"
 msgstr "состояние неизвестно"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "Использовать другой сценарий SIEVE"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 #, fuzzy
 msgid "Mail reject size"
 msgstr "Размер квоты"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 #, fuzzy
 msgid "Spam folder"
 msgstr "в папку"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 #, fuzzy
 msgid "to"
 msgstr "Отношение"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 #, fuzzy
 msgid "Vacation interval"
 msgstr "Сообщение автоответчика"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Информация об организации"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 #, fuzzy
 msgid "Spam level"
 msgstr "Уровень информативности"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Размер квоты"
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 #, fuzzy
 msgid "Sieve management"
 msgstr "Название"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "Отклонять сообщения размером больше"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Основной адрес"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 #, fuzzy
 msgid "Local delivery"
 msgstr "Последняя доставка"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "Не оставлять копии в своем почтовом ящике"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Альтернативные адреса"
@@ -2475,28 +2477,28 @@ msgstr "Пользователь"
 msgid "Group"
 msgstr "Группа"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 #, fuzzy
 msgid "None"
 msgstr "нет"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 #, fuzzy
 msgid "Unknown"
 msgstr "состояние неизвестно"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 #, fuzzy
 msgid "Unlimited"
 msgstr "не определена"
diff --git a/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
index f50aac3ff..b051d77f3 100644
--- a/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mail/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,10 +45,10 @@ msgstr "创建邮件账号"
 #: personal/mail/class_mailAccount.inc:366
 #: personal/mail/class_mailAccount.inc:371
 #: personal/mail/class_mailAccount.inc:384
-#: personal/mail/class_mailAccount.inc:1000
-#: personal/mail/class_mailAccount.inc:1004
-#: personal/mail/class_mailAccount.inc:1022
-#: personal/mail/class_mailAccount.inc:1385
+#: personal/mail/class_mailAccount.inc:1014
+#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1036
+#: personal/mail/class_mailAccount.inc:1429
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:56
 msgid "Mail address"
 msgstr "邮件地址"
@@ -64,8 +65,8 @@ msgstr ""
 #: admin/systems/services/mail/class_goMailServer.inc:582
 #: admin/systems/services/virus/class_goVirusServer.inc:154
 #: admin/systems/services/spam/class_goSpamServer.inc:277
-#: personal/mail/class_mailAccount.inc:817
-#: personal/mail/class_mailAccount.inc:890
+#: personal/mail/class_mailAccount.inc:831
+#: personal/mail/class_mailAccount.inc:904
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -86,9 +87,9 @@ msgstr "LDAP 错误:"
 #: personal/mail/class_mailAccount.inc:242
 #: personal/mail/class_mailAccount.inc:247
 #: personal/mail/class_mailAccount.inc:249
-#: personal/mail/class_mailAccount.inc:984
-#: personal/mail/class_mailAccount.inc:1209
-#: personal/mail/class_mailAccount.inc:1375
+#: personal/mail/class_mailAccount.inc:998
+#: personal/mail/class_mailAccount.inc:1253
+#: personal/mail/class_mailAccount.inc:1419
 msgid "Mail"
 msgstr "邮件"
 
@@ -103,7 +104,7 @@ msgstr "邮件传递列表"
 
 #: admin/ogroups/mail/mail.tpl:10 admin/groups/mail/class_groupMail.inc:860
 #: admin/groups/mail/mail.tpl:7 admin/groups/mail/paste_mail.tpl:8
-#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:996
+#: personal/mail/generic.tpl:9 personal/mail/class_mailAccount.inc:1010
 #: personal/mail/copypaste.tpl:7
 msgid "Primary address"
 msgstr "主要地址"
@@ -133,11 +134,11 @@ msgstr "请输入一个邮件地址"
 #: personal/mail/class_mailAccount.inc:153
 #: personal/mail/class_mailAccount.inc:158
 #: personal/mail/class_mailAccount.inc:161
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:830
-#: personal/mail/class_mailAccount.inc:904
-#: personal/mail/class_mailAccount.inc:908
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:844
+#: personal/mail/class_mailAccount.inc:918
+#: personal/mail/class_mailAccount.inc:922
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy
 msgid "Mail error"
 msgstr "邮件服务器"
@@ -168,8 +169,8 @@ msgstr "IMAP 共享目录"
 #: admin/groups/mail/class_groupMail.inc:565
 #: admin/groups/mail/class_groupMail.inc:795
 #: personal/mail/class_mailAccount.inc:158
-#: personal/mail/class_mailAccount.inc:826
-#: personal/mail/class_mailAccount.inc:904
+#: personal/mail/class_mailAccount.inc:840
+#: personal/mail/class_mailAccount.inc:918
 #, php-format
 msgid "Mail method cannot connect: %s"
 msgstr ""
@@ -230,20 +231,20 @@ msgstr "您正在尝试向转发列表添加一条无效邮件地址。"
 
 #: admin/groups/mail/class_groupMail.inc:424
 #: personal/mail/class_mailAccount.inc:380
-#: personal/mail/class_mailAccount.inc:1018
+#: personal/mail/class_mailAccount.inc:1032
 #, fuzzy, php-format
 msgid "Address is already in use by group '%s'."
 msgstr "您正在添加的地址已经被用户使用"
 
 #: admin/groups/mail/class_groupMail.inc:426
 #: personal/mail/class_mailAccount.inc:382
-#: personal/mail/class_mailAccount.inc:1020
+#: personal/mail/class_mailAccount.inc:1034
 #, fuzzy, php-format
 msgid "Address is already in use by user '%s'."
 msgstr "您正在添加的地址已经被用户使用"
 
 #: admin/groups/mail/class_groupMail.inc:569
-#: personal/mail/class_mailAccount.inc:830
+#: personal/mail/class_mailAccount.inc:844
 #, fuzzy, php-format
 msgid "Cannot remove mailbox: %s"
 msgstr "无法删除 IMAP 邮箱。服务器返回 '%s'。"
@@ -260,13 +261,13 @@ msgid "New"
 msgstr "添加用户"
 
 #: admin/groups/mail/class_groupMail.inc:799
-#: personal/mail/class_mailAccount.inc:908
+#: personal/mail/class_mailAccount.inc:922
 #, fuzzy, php-format
 msgid "Cannot update mailbox: %s"
 msgstr "无法创建 IMAP 邮箱。服务器返回 '%s'。"
 
 #: admin/groups/mail/class_groupMail.inc:803
-#: personal/mail/class_mailAccount.inc:912
+#: personal/mail/class_mailAccount.inc:926
 #, fuzzy, php-format
 msgid "Cannot write quota settings: %s"
 msgstr "无法创建文件 '%s'。"
@@ -280,14 +281,14 @@ msgstr ""
 
 #: admin/groups/mail/class_groupMail.inc:869
 #: admin/groups/mail/class_groupMail.inc:1004 admin/groups/mail/mail.tpl:60
-#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1030
-#: personal/mail/class_mailAccount.inc:1215
-#: personal/mail/class_mailAccount.inc:1387
+#: personal/mail/generic.tpl:57 personal/mail/class_mailAccount.inc:1044
+#: personal/mail/class_mailAccount.inc:1259
+#: personal/mail/class_mailAccount.inc:1431
 msgid "Quota size"
 msgstr "Quota 大小"
 
 #: admin/groups/mail/class_groupMail.inc:888
-#: personal/mail/class_mailAccount.inc:1399
+#: personal/mail/class_mailAccount.inc:1443
 #, fuzzy
 msgid "Mail max size"
 msgstr "邮件大小"
@@ -298,7 +299,7 @@ msgstr "为了退信，您需要设定最大的邮件大小。"
 
 #: admin/groups/mail/class_groupMail.inc:900
 #: admin/groups/mail/class_groupMail.inc:1005
-#: personal/mail/class_mailAccount.inc:1386
+#: personal/mail/class_mailAccount.inc:1430
 msgid "Mail server"
 msgstr "邮件服务器"
 
@@ -359,12 +360,12 @@ msgid "Reload"
 msgstr "读"
 
 #: admin/groups/mail/mail.tpl:102 admin/groups/mail/paste_mail.tpl:23
-#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:25
+#: personal/mail/generic.tpl:73 personal/mail/copypaste.tpl:38
 msgid "Alternative addresses"
 msgstr "替代地址"
 
 #: admin/groups/mail/mail.tpl:107 admin/groups/mail/paste_mail.tpl:24
-#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:55
+#: personal/mail/generic.tpl:76 personal/mail/copypaste.tpl:68
 msgid "List of alternative mail addresses"
 msgstr "替代邮件地址列表"
 
@@ -417,7 +418,7 @@ msgid "Not used in all groups"
 msgstr "显示实用组"
 
 #: admin/groups/mail/mail.tpl:234 admin/groups/mail/paste_mail.tpl:42
-#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:44
+#: personal/mail/generic.tpl:269 personal/mail/copypaste.tpl:57
 msgid "Add local"
 msgstr "添加本地"
 
@@ -465,7 +466,7 @@ msgstr "选择一个特定的部门"
 msgid "Choose"
 msgstr "选择"
 
-#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1376
+#: admin/groups/mail/paste_mail.tpl:1 personal/mail/class_mailAccount.inc:1420
 #: personal/mail/copypaste.tpl:1
 msgid "Mail settings"
 msgstr "邮件选项"
@@ -946,6 +947,7 @@ msgid "Enabled bayes auto learning"
 msgstr "启用 bayes 自动学习"
 
 #: admin/systems/services/spam/goSpamServerRule.tpl:6
+#: personal/mail/mailAddressSelect/selectMailAddress-filter.tpl:22
 #: personal/mail/mailAddressSelect/selectMailAddress-list.xml:48
 msgid "Name"
 msgstr "名称"
@@ -1174,7 +1176,7 @@ msgstr "邮件头"
 msgid "Display header of this message"
 msgstr "显示此邮件邮件头"
 
-#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1407
+#: personal/mail/generic.tpl:115 personal/mail/class_mailAccount.inc:1451
 msgid "Use custom sieve script"
 msgstr "定制过滤脚本"
 
@@ -1204,8 +1206,8 @@ msgstr "选择用下面定义的假期信息作为自动回复"
 msgid "Activate vacation message"
 msgstr "启用假期信息"
 
-#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1059
-#: personal/mail/class_mailAccount.inc:1239
+#: personal/mail/generic.tpl:160 personal/mail/class_mailAccount.inc:1073
+#: personal/mail/class_mailAccount.inc:1283
 msgid "from"
 msgstr "从"
 
@@ -1243,7 +1245,7 @@ msgstr "MB"
 #: personal/mail/sieve/templates/element_vacation.tpl:44
 #: personal/mail/sieve/class_sieveManagement.inc:502
 #: personal/mail/sieve/class_sieveManagement.inc:720
-#: personal/mail/class_mailAccount.inc:1390
+#: personal/mail/class_mailAccount.inc:1434
 msgid "Vacation message"
 msgstr "假期信息"
 
@@ -1253,7 +1255,7 @@ msgstr "假期信息"
 msgid "Import"
 msgstr "导入"
 
-#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:13
+#: personal/mail/generic.tpl:246 personal/mail/copypaste.tpl:26
 msgid "Forward messages to"
 msgstr "转发邮件到"
 
@@ -2257,8 +2259,8 @@ msgid "User mail settings"
 msgstr "用户邮件选项"
 
 #: personal/mail/class_mailAccount.inc:618
-#: personal/mail/class_mail-methods.inc:140
-#: personal/mail/class_mail-methods.inc:485
+#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:486
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
@@ -2290,85 +2292,85 @@ msgstr "您无权删除这个部门。"
 msgid "unknown"
 msgstr "未知"
 
-#: personal/mail/class_mailAccount.inc:926
+#: personal/mail/class_mailAccount.inc:940
 #, fuzzy
 msgid "Mail error saving sieve settings"
 msgstr "定制过滤脚本"
 
-#: personal/mail/class_mailAccount.inc:1039
-#: personal/mail/class_mailAccount.inc:1047
-#: personal/mail/class_mailAccount.inc:1224
+#: personal/mail/class_mailAccount.inc:1053
+#: personal/mail/class_mailAccount.inc:1061
+#: personal/mail/class_mailAccount.inc:1268
 #, fuzzy
 msgid "Mail reject size"
 msgstr "邮件大小"
 
-#: personal/mail/class_mailAccount.inc:1051
-#: personal/mail/class_mailAccount.inc:1231
+#: personal/mail/class_mailAccount.inc:1065
+#: personal/mail/class_mailAccount.inc:1275
 #, fuzzy
 msgid "Spam folder"
 msgstr "到目录"
 
-#: personal/mail/class_mailAccount.inc:1063
-#: personal/mail/class_mailAccount.inc:1243
+#: personal/mail/class_mailAccount.inc:1077
+#: personal/mail/class_mailAccount.inc:1287
 #, fuzzy
 msgid "to"
 msgstr "停止"
 
-#: personal/mail/class_mailAccount.inc:1074
-#: personal/mail/class_mailAccount.inc:1254
+#: personal/mail/class_mailAccount.inc:1088
+#: personal/mail/class_mailAccount.inc:1298
 #, fuzzy
 msgid "Vacation interval"
 msgstr "假期信息"
 
-#: personal/mail/class_mailAccount.inc:1380
+#: personal/mail/class_mailAccount.inc:1424
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/mail/class_mailAccount.inc:1389
+#: personal/mail/class_mailAccount.inc:1433
 #, fuzzy
 msgid "Add vacation information"
 msgstr "组织信息"
 
-#: personal/mail/class_mailAccount.inc:1392
+#: personal/mail/class_mailAccount.inc:1436
 msgid "Use spam filter"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1393
+#: personal/mail/class_mailAccount.inc:1437
 #, fuzzy
 msgid "Spam level"
 msgstr "日志级别"
 
-#: personal/mail/class_mailAccount.inc:1394
+#: personal/mail/class_mailAccount.inc:1438
 msgid "Spam mail box"
 msgstr ""
 
-#: personal/mail/class_mailAccount.inc:1396
+#: personal/mail/class_mailAccount.inc:1440
 #, fuzzy
 msgid "Sieve management"
 msgstr "系统管理"
 
-#: personal/mail/class_mailAccount.inc:1398
+#: personal/mail/class_mailAccount.inc:1442
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "拒绝邮件大小超过"
 
-#: personal/mail/class_mailAccount.inc:1401
-#: personal/mail/class_mailAccount.inc:1406
+#: personal/mail/class_mailAccount.inc:1445
+#: personal/mail/class_mailAccount.inc:1450
 #, fuzzy
 msgid "Forwarding address"
 msgstr "主要地址"
 
-#: personal/mail/class_mailAccount.inc:1402
+#: personal/mail/class_mailAccount.inc:1446
 #, fuzzy
 msgid "Local delivery"
 msgstr "最后传递"
 
-#: personal/mail/class_mailAccount.inc:1403
+#: personal/mail/class_mailAccount.inc:1447
 #, fuzzy
 msgid "No delivery to own mailbox "
 msgstr "不要发送到本人邮箱"
 
-#: personal/mail/class_mailAccount.inc:1404
+#: personal/mail/class_mailAccount.inc:1448
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "替代地址"
@@ -2405,27 +2407,27 @@ msgstr "用户"
 msgid "Group"
 msgstr "组"
 
-#: personal/mail/class_mail-methods.inc:141
+#: personal/mail/class_mail-methods.inc:142
 #, php-format
 msgid "The configured mail attribute '%s' is unsupported!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:486
+#: personal/mail/class_mail-methods.inc:487
 #, php-format
 msgid "Mail method '%s' is unknown!"
 msgstr ""
 
-#: personal/mail/class_mail-methods.inc:712
 #: personal/mail/class_mail-methods.inc:713
+#: personal/mail/class_mail-methods.inc:714
 #, fuzzy
 msgid "None"
 msgstr "无"
 
-#: personal/mail/class_mail-methods.inc:802
+#: personal/mail/class_mail-methods.inc:803
 msgid "Unknown"
 msgstr "未知"
 
-#: personal/mail/class_mail-methods.inc:804
+#: personal/mail/class_mail-methods.inc:805
 #, fuzzy
 msgid "Unlimited"
 msgstr "无限"
diff --git a/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po
index b622bc7da..db5f9aec0 100644
--- a/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-12-03 15:12+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -182,8 +183,8 @@ msgstr "Diese Richtlinie wird %d mal verwendet."
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr "Der für '%s' angegebene Wert muss kleiner als der für '%s' sein!"
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -328,7 +329,7 @@ msgid "Prohibit renewable tickets"
 msgstr "Erneuerbare Tickets verbieten"
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr "Zurückdatierte Tickets verbieten"
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po
index b91df0898..3fed4069b 100644
--- a/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-28 23:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,15 +83,18 @@ msgstr "Servicios"
 msgid "Policies"
 msgstr "Políticas"
 
-#: admin/systems/services/kerberos/class_password-methods-MIT.inc:235, php-format
+#: admin/systems/services/kerberos/class_password-methods-MIT.inc:235
+#, php-format
 msgid "Cannot load principal '%s', from server '%s'!"
 msgstr "¡No se ha podido cargar el principal '%s' desde el servidor '%s'!"
 
-#: admin/systems/services/kerberos/class_password-methods-MIT.inc:291, php-format
+#: admin/systems/services/kerberos/class_password-methods-MIT.inc:291
+#, php-format
 msgid "Cannot load principals from server '%s'!"
 msgstr "¡No se ha podido cargar principales desde el servidor '%s'!"
 
-#: admin/systems/services/kerberos/class_password-methods-MIT.inc:319, php-format
+#: admin/systems/services/kerberos/class_password-methods-MIT.inc:319
+#, php-format
 msgid "Cannot load policies from server '%s'!"
 msgstr "¡No se ha podido cargar políticas desde el servidor '%s'!"
 
@@ -173,10 +177,11 @@ msgid "This policy is referenced %d times."
 msgstr "Se hace referencia a esta política %d veces."
 
 #: admin/systems/services/kerberos/class_krb5_policy.inc:133
-#: admin/systems/services/kerberos/class_krb5_policy.inc:150, php-format
+#: admin/systems/services/kerberos/class_krb5_policy.inc:150
+#, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr ""
 "¡El valor especificado para '%s' debe ser menor que el valor especificado "
 "para '%s'!"
@@ -323,7 +328,8 @@ msgid "Prohibit renewable tickets"
 msgstr "Prohibir tickets renovables"
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+#, fuzzy
+msgid "Pohibit postdated tickets"
 msgstr "Prohibir tickes caducados"
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po
index 243d02bdf..4f53e1bc8 100644
--- a/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-30 11:35+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,8 @@ msgid "Realm"
 msgstr "Domaine"
 
 #: admin/systems/services/kerberos/class_goKrbServer.inc:182
-msgid "Cannot apply policy changes! The defined kerberos server has no mac address."
+msgid ""
+"Cannot apply policy changes! The defined kerberos server has no mac address."
 msgstr ""
 "Impossible d'appliquer les changement de polices de sécurité ! Le serveur "
 "Kerberos défini n'a pas d'adresse MAC."
@@ -174,8 +176,8 @@ msgstr "Cette politique de sécurité est référencée %d fois."
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr ""
 "La valeur spécifiée pour '%s' doit être plus petite que la valeur spécifiée "
 "pour '%s' !"
@@ -322,7 +324,8 @@ msgid "Prohibit renewable tickets"
 msgstr "Interdire les tickets renouvelables"
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+#, fuzzy
+msgid "Pohibit postdated tickets"
 msgstr "Interdire les tickets ayant une date dans le futur"
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
@@ -356,4 +359,3 @@ msgstr "Interdire l'emission de tickets"
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:241
 msgid "Save"
 msgstr "Enregistrer"
-
diff --git a/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po
index 128f13ec4..21baf8692 100644
--- a/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -187,8 +188,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr ""
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -352,7 +353,7 @@ msgid "Prohibit renewable tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/messages.po b/gosa-plugins/mit-krb5/locale/messages.po
index dbffe2646..177462067 100644
--- a/gosa-plugins/mit-krb5/locale/messages.po
+++ b/gosa-plugins/mit-krb5/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -175,8 +176,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr ""
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -319,7 +320,7 @@ msgid "Prohibit renewable tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po
index 79d66aaee..badaa0d43 100644
--- a/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -191,8 +192,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, fuzzy, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr "De sieve poort dient nummeriek te zijn."
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -356,7 +357,7 @@ msgid "Prohibit renewable tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po
index c59dc16c8..8232d7990 100644
--- a/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -184,8 +185,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, fuzzy, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr "Port sieve musi być liczbą."
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -349,7 +350,7 @@ msgid "Prohibit renewable tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po
index 33f91c1bd..400eedd16 100644
--- a/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -186,8 +187,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr ""
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -351,7 +352,7 @@ msgid "Prohibit renewable tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po
index 285a090b1..f45175eb7 100644
--- a/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/mit-krb5/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -188,8 +189,8 @@ msgstr ""
 #: admin/systems/services/kerberos/class_krb5_policy.inc:150
 #, fuzzy, php-format
 msgid ""
-"The value specified for '%s' must be smaller than the value specified for '%"
-"s'!"
+"The value specified for '%s' must be smaller than the value specified for "
+"'%s'!"
 msgstr "指定 '%s' 的值必须是数字类型。"
 
 #: admin/systems/services/kerberos/class_krb_host_keys.inc:233
@@ -352,7 +353,7 @@ msgid "Prohibit renewable tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:217
-msgid "Prohibit postdated tickets"
+msgid "Pohibit postdated tickets"
 msgstr ""
 
 #: admin/systems/services/kerberos/pwd_kerberos_mit.tpl:219
diff --git a/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po
index fbb8e0276..202c9c8d7 100644
--- a/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 16:12+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po
index da7dc422f..bbfd96295 100644
--- a/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po
index e516312ce..2541df45b 100644
--- a/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2009-06-30 11:25+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po
index 5154f16ee..c403d0151 100644
--- a/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/messages.po b/gosa-plugins/nagios/locale/messages.po
index 9ad820bd7..cce9918fd 100644
--- a/gosa-plugins/nagios/locale/messages.po
+++ b/gosa-plugins/nagios/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po
index f0c5ccce3..4d50a2d3d 100644
--- a/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po
index 5160e89a6..17cca8cf6 100644
--- a/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po
index 2d5f81966..890099537 100644
--- a/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po
index 83711d432..be5f24c87 100644
--- a/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/nagios/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po
index d85fdb320..10e1d9a6c 100644
--- a/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/de/LC_MESSAGES/messages.po
@@ -12,17 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 14:23+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -30,41 +31,41 @@ msgstr "Netatalk"
 msgid "Manage netatalk account"
 msgstr "Netatalk-Konto verwalten"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 msgid "netatalk"
 msgstr "Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr "Netatalk- oder NFS-Freigabe"
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Freigabe"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 msgid "User home path"
 msgstr "Benutzer Basisverzeichnis"
 
diff --git a/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po
index 60ef53513..576ec6312 100644
--- a/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:52+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -27,41 +28,41 @@ msgstr "Netatalk"
 msgid "Manage netatalk account"
 msgstr "Administrar cuenta Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 msgid "netatalk"
 msgstr "Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr "netatalk o compartido NFS"
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Recurso compartido"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 msgid "User home path"
 msgstr "Ruta del directorio del usuario"
 
diff --git a/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po
index 318a898a1..08d652e7a 100644
--- a/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-08 15:34+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr ""
 
@@ -23,41 +24,41 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr "Gèrer un compte Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 msgid "netatalk"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr "UNIX"
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr "Partage netatalk ou NFS"
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Partage"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 msgid "User home path"
 msgstr "Chemin du répertoire personnel"
 
diff --git a/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po
index 23be2078b..e337f2c21 100644
--- a/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/it/LC_MESSAGES/messages.po
@@ -6,17 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr ""
 
@@ -25,43 +26,43 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr "Crea estensioni telefoniche"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 msgid "netatalk"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 #, fuzzy
 msgid "Share"
 msgstr "reset"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Identità"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 #, fuzzy
 msgid "User home path"
 msgstr "Telefono privato"
diff --git a/gosa-plugins/netatalk/locale/messages.po b/gosa-plugins/netatalk/locale/messages.po
index f9d2e231e..25633e754 100644
--- a/gosa-plugins/netatalk/locale/messages.po
+++ b/gosa-plugins/netatalk/locale/messages.po
@@ -8,16 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr ""
 
@@ -25,41 +26,41 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 msgid "netatalk"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 msgid "LDAP error"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 msgid "User home path"
 msgstr ""
 
diff --git a/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po
index 4e8a81265..83559fbf6 100644
--- a/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/nl/LC_MESSAGES/messages.po
@@ -11,16 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -28,43 +29,43 @@ msgstr "Netatalk"
 msgid "Manage netatalk account"
 msgstr "Netatalk account beheren"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 #, fuzzy
 msgid "netatalk"
 msgstr "Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Share"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 #, fuzzy
 msgid "User home path"
 msgstr "Profielpad"
diff --git a/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po
index d915aea11..78e32ed46 100644
--- a/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "X-Poedit-Basepath: tedst\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -23,43 +24,43 @@ msgstr "Netatalk"
 msgid "Manage netatalk account"
 msgstr "Zarządzaj kontem Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 #, fuzzy
 msgid "netatalk"
 msgstr "Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Udział"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 #, fuzzy
 msgid "User home path"
 msgstr "Ścieżka do profilu"
diff --git a/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po
index 30678bf7a..389e2d28b 100644
--- a/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/ru/LC_MESSAGES/messages.po
@@ -5,17 +5,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr ""
 
@@ -24,43 +25,43 @@ msgstr ""
 msgid "Manage netatalk account"
 msgstr "Создать телефонный аккаунт"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 msgid "netatalk"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 #, fuzzy
 msgid "Share"
 msgstr "сброс"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 #, fuzzy
 msgid "User home path"
 msgstr "Домашний телефон"
diff --git a/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po
index 190584fca..95f9413ae 100644
--- a/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/netatalk/locale/zh/LC_MESSAGES/messages.po
@@ -7,17 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: personal/netatalk/class_netatalk.inc:36
-#: personal/netatalk/class_netatalk.inc:372
+#: personal/netatalk/class_netatalk.inc:365
 msgid "Netatalk"
 msgstr "Netatalk"
 
@@ -25,43 +26,43 @@ msgstr "Netatalk"
 msgid "Manage netatalk account"
 msgstr "管理 netatalk 账号"
 
-#: personal/netatalk/class_netatalk.inc:176
+#: personal/netatalk/class_netatalk.inc:169
+#: personal/netatalk/class_netatalk.inc:177
+#: personal/netatalk/class_netatalk.inc:178
+#: personal/netatalk/class_netatalk.inc:183
 #: personal/netatalk/class_netatalk.inc:184
-#: personal/netatalk/class_netatalk.inc:185
+#: personal/netatalk/class_netatalk.inc:186
+#: personal/netatalk/class_netatalk.inc:187
+#: personal/netatalk/class_netatalk.inc:189
 #: personal/netatalk/class_netatalk.inc:190
-#: personal/netatalk/class_netatalk.inc:191
-#: personal/netatalk/class_netatalk.inc:193
-#: personal/netatalk/class_netatalk.inc:194
-#: personal/netatalk/class_netatalk.inc:196
-#: personal/netatalk/class_netatalk.inc:197
 #, fuzzy
 msgid "netatalk"
 msgstr "Netatalk"
 
-#: personal/netatalk/class_netatalk.inc:191
+#: personal/netatalk/class_netatalk.inc:184
 msgid "POSIX"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:194
+#: personal/netatalk/class_netatalk.inc:187
 msgid "netatalk or NFS share"
 msgstr ""
 
-#: personal/netatalk/class_netatalk.inc:228
-#: personal/netatalk/class_netatalk.inc:382 personal/netatalk/netatalk.tpl:4
+#: personal/netatalk/class_netatalk.inc:221
+#: personal/netatalk/class_netatalk.inc:375 personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "共享"
 
-#: personal/netatalk/class_netatalk.inc:292
-#: personal/netatalk/class_netatalk.inc:357
+#: personal/netatalk/class_netatalk.inc:285
+#: personal/netatalk/class_netatalk.inc:350
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: personal/netatalk/class_netatalk.inc:376
+#: personal/netatalk/class_netatalk.inc:369
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/netatalk/class_netatalk.inc:381
+#: personal/netatalk/class_netatalk.inc:374
 #, fuzzy
 msgid "User home path"
 msgstr "Profile path"
diff --git a/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po
index c2c341d5d..e9ebbbfea 100644
--- a/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-04 09:30+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,8 +66,8 @@ msgid "Open Groupware database"
 msgstr "Opengroupware-Datenbank"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
-msgid "Open Groupware"
-msgstr "Open Groupware"
+msgid "OpenGroupware"
+msgstr "OpenGroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
 msgid "Open groupware account settings"
diff --git a/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po
index 63c3d2dbb..106c0a30f 100644
--- a/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:56+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,8 @@ msgid "Open Groupware database"
 msgstr "Base de datos de OpenGroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
-msgid "Open Groupware"
+#, fuzzy
+msgid "OpenGroupware"
 msgstr "Open Groupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po
index f321f7d13..5b51d8136 100644
--- a/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-08 15:35+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,8 +59,9 @@ msgid "Open Groupware database"
 msgstr "Base de données Opengroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
-msgid "Open Groupware"
-msgstr ""
+#, fuzzy
+msgid "OpenGroupware"
+msgstr "Base de données Opengroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
 msgid "Open groupware account settings"
diff --git a/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po
index 8ec480391..b1e25cced 100644
--- a/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,7 +68,7 @@ msgstr "Estenzioni PHPGroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
 #, fuzzy
-msgid "Open Groupware"
+msgid "OpenGroupware"
 msgstr "Estenzioni PHPGroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/opengroupware/locale/messages.po b/gosa-plugins/opengroupware/locale/messages.po
index 5815b21f5..110db3dd4 100644
--- a/gosa-plugins/opengroupware/locale/messages.po
+++ b/gosa-plugins/opengroupware/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,7 +61,7 @@ msgid "Open Groupware database"
 msgstr ""
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
-msgid "Open Groupware"
+msgid "OpenGroupware"
 msgstr ""
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po
index e910e7f89..34c936dda 100644
--- a/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr "OpenGroupware account"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
 #, fuzzy
-msgid "Open Groupware"
+msgid "OpenGroupware"
 msgstr "OpenGroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po
index 9591fbdd5..b729a9f33 100644
--- a/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,7 +62,7 @@ msgstr "Konto Opengroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
 #, fuzzy
-msgid "Open Groupware"
+msgid "OpenGroupware"
 msgstr "Opengroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po
index 299914a39..5c4385564 100644
--- a/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +67,7 @@ msgstr "Учетная запись Groupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
 #, fuzzy
-msgid "Open Groupware"
+msgid "OpenGroupware"
 msgstr "Учетная запись Groupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po
index 08a391ab7..8f438c27c 100644
--- a/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opengroupware/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,7 +65,7 @@ msgstr "Opengroupware 账号"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:180
 #, fuzzy
-msgid "Open Groupware"
+msgid "OpenGroupware"
 msgstr "Opengroupware"
 
 #: personal/connectivity/opengroupware/class_opengwAccount.inc:339
diff --git a/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po
index fbda41d36..884bd2f45 100644
--- a/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-04 09:30+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po
index 000b32c03..617350e9b 100644
--- a/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 23:36+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po
index ad633f7ce..aea962b8a 100644
--- a/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-08 15:36+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po
index 3a371536f..761e7f97c 100644
--- a/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/messages.po b/gosa-plugins/openxchange/locale/messages.po
index b1e2495f1..d00cfcf82 100644
--- a/gosa-plugins/openxchange/locale/messages.po
+++ b/gosa-plugins/openxchange/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po
index 24d3cf4f3..0f4335e88 100644
--- a/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po
index e29d54148..99d4bea38 100644
--- a/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po
index deca0e9a3..4660d2d01 100644
--- a/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po
index d9ed93148..ed5cc0797 100644
--- a/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/openxchange/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po
index de94cc040..166bd80be 100644
--- a/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opsi/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2009-09-30 12:47+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,6 +48,7 @@ msgstr "Wiederholen"
 #: admin/opsi/generic.tpl:18 admin/opsi/generic.tpl:37
 #: admin/opsi/class_opsigeneric.inc:224 admin/opsi/class_opsigeneric.inc:229
 #: admin/opsi/class_opsigeneric.inc:232 admin/opsi/class_opsigeneric.inc:746
+#: admin/opsiLicenses/opsiLicense-filter.tpl:13
 #: admin/opsiLicenses/class_licenseGeneric.inc:232
 #: admin/opsiLicenses/class_licenseGeneric.inc:278
 #: admin/opsiLicenses/opsiLicense-list.xml:41
@@ -234,7 +236,6 @@ msgid "License usage"
 msgstr "Lizenznutzung"
 
 #: admin/opsiLicenses/opsiLicense-filter.tpl:3
-#, fuzzy
 msgid "Filter"
 msgstr "Filter"
 
@@ -269,14 +270,12 @@ msgid "License generic"
 msgstr "Allgemein"
 
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:244
-#, fuzzy
 msgid "Usage by host"
-msgstr "Benutzt von"
+msgstr "Nutzung pro Host"
 
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:245
-#, fuzzy
 msgid "License usage by host"
-msgstr "Lizenznutzung"
+msgstr "Lizenznutzung pro Host"
 
 #: admin/opsiLicenses/class_licenseUsageByHost.inc:252
 #: admin/opsiLicenses/licenseGeneric.tpl:237
@@ -314,28 +313,24 @@ msgid "Remove"
 msgstr "Entfernen"
 
 #: admin/opsiLicenses/opsiLicense-list.xml:108
-#, fuzzy
 msgid "Edit license"
-msgstr "Benutzer bearbeiten"
+msgstr "Lizenz bearbeiten"
 
 #: admin/opsiLicenses/opsiLicense-list.xml:116
-#, fuzzy
 msgid "Remove license"
-msgstr "Benutzer entfernen"
+msgstr "Lizenz entfernen"
 
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:262
 msgid "unlimited"
 msgstr "unbegrenzt"
 
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:269
-#, fuzzy, php-format
 msgid "Volume license (#%s)"
-msgstr "Volumenlizenz %s"
+msgstr "Volumenlizenz (#%s)"
 
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:272
-#, fuzzy
 msgid "Concurrent"
-msgstr "Aktuell"
+msgstr "Konkurrierend"
 
 #: admin/opsiLicenses/class_licensePoolGeneric.inc:519
 msgid "Pool generic"
@@ -403,44 +398,9 @@ msgid "none"
 msgstr "keine"
 
 #: admin/opsiLicenses/class_licenseByProduct.inc:136
-#, fuzzy
 msgid "Usage by product"
-msgstr "Installierte Produkte"
+msgstr "Nutzung pro Produkt"
 
 #: admin/opsiLicenses/class_licenseByProduct.inc:137
-#, fuzzy
 msgid "License usage by product"
-msgstr "Lizenznutzung"
-
-#~ msgid "Select all"
-#~ msgstr "Alle auswählen"
-
-#~ msgid "License pools"
-#~ msgstr "Lizenzpools"
-
-#~ msgid "Regular expression for matching license pools"
-#~ msgstr "Regulärer Ausdruck zum Erkennen von Lizenzpools"
-
-#~ msgid "edit"
-#~ msgstr "Bearbeiten"
-
-#~ msgid "Edit this entry"
-#~ msgstr "Diesen Eintrag bearbeiten"
-
-#~ msgid "delete"
-#~ msgstr "Entfernen"
-
-#~ msgid "Delete this entry"
-#~ msgstr "Diesen Eintrag entfernen"
-
-#~ msgid "Number of listed license pools"
-#~ msgstr "Anzahl der angezeigten Lizenzpools"
-
-#~ msgid "Permission"
-#~ msgstr "Berechtigung"
-
-#~ msgid "Permission error"
-#~ msgstr "Berechtigungsfehler"
-
-#~ msgid "Usage"
-#~ msgstr "Nutzung"
+msgstr "Lizenznutzung pro Produkt"
diff --git a/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po
index 0bd01b6e8..7f252fdc5 100644
--- a/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/opsi/locale/fr/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-18 23:05+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,6 +48,7 @@ msgstr "Réessayer"
 #: admin/opsi/generic.tpl:18 admin/opsi/generic.tpl:37
 #: admin/opsi/class_opsigeneric.inc:224 admin/opsi/class_opsigeneric.inc:229
 #: admin/opsi/class_opsigeneric.inc:232 admin/opsi/class_opsigeneric.inc:746
+#: admin/opsiLicenses/opsiLicense-filter.tpl:13
 #: admin/opsiLicenses/class_licenseGeneric.inc:232
 #: admin/opsiLicenses/class_licenseGeneric.inc:278
 #: admin/opsiLicenses/opsiLicense-list.xml:41
diff --git a/gosa-plugins/opsi/locale/messages.po b/gosa-plugins/opsi/locale/messages.po
index 8d4772cad..e46608f41 100644
--- a/gosa-plugins/opsi/locale/messages.po
+++ b/gosa-plugins/opsi/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,6 +41,7 @@ msgstr ""
 #: admin/opsi/generic.tpl:18 admin/opsi/generic.tpl:37
 #: admin/opsi/class_opsigeneric.inc:224 admin/opsi/class_opsigeneric.inc:229
 #: admin/opsi/class_opsigeneric.inc:232 admin/opsi/class_opsigeneric.inc:746
+#: admin/opsiLicenses/opsiLicense-filter.tpl:13
 #: admin/opsiLicenses/class_licenseGeneric.inc:232
 #: admin/opsiLicenses/class_licenseGeneric.inc:278
 #: admin/opsiLicenses/opsiLicense-list.xml:41
diff --git a/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po
index 233eddfda..7c747d67a 100644
--- a/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 14:24+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po
index 0df12268a..bbb07f8f9 100644
--- a/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po
index e6076e755..4d44b068e 100644
--- a/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2009-06-30 11:28+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po
index defa5016d..914ba3e0b 100644
--- a/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/messages.po b/gosa-plugins/phpgw/locale/messages.po
index cd703fc03..6eaa46182 100644
--- a/gosa-plugins/phpgw/locale/messages.po
+++ b/gosa-plugins/phpgw/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po
index 1cff9ae3a..050d5c603 100644
--- a/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po
index 093edb5db..9d0ab536c 100644
--- a/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po
index c6491f5a4..b1e8b8e15 100644
--- a/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po
index a15ccdb5d..85b80572b 100644
--- a/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpgw/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:30+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po
index 4e43cce6e..d83489c3a 100644
--- a/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 16:03+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po
index 263f6abee..abe32bc33 100644
--- a/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po
index a1fff59d1..3b082b2ae 100644
--- a/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-08 15:37+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po
index 2d9c44e91..fa051ab07 100644
--- a/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/messages.po b/gosa-plugins/phpscheduleit/locale/messages.po
index 97ef5437f..0945a765a 100644
--- a/gosa-plugins/phpscheduleit/locale/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po
index 846b700c9..a6ec78a93 100644
--- a/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po
index 1641f3822..c89458111 100644
--- a/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po
index ebc8a7b0d..6c04f4a5e 100644
--- a/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po
index 289b10a09..b4aa96b6d 100644
--- a/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/phpscheduleit/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po
index caa68cf54..bef414269 100644
--- a/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/de/LC_MESSAGES/messages.po
@@ -12,17 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 16:13+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr "PPTP"
 
@@ -31,19 +32,19 @@ msgid "This does something"
 msgstr "Dies tut etwas"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr "PPTP-Konto"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 msgid "Connectivity addon"
 msgstr "Konnektivitäts-Erweiterung"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Mein Konto"
diff --git a/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po
index 7aa5fdf65..6f98b7449 100644
--- a/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:51+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr "PPTP"
 
@@ -28,20 +29,20 @@ msgid "This does something"
 msgstr "Esto hace algo"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr "Cuenta PPTP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 msgid "Connectivity addon"
 msgstr "Conectividad adicional"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Mi cuenta"
 
diff --git a/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po
index 1757e7c32..b09ea26bb 100644
--- a/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-08 15:38+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr "Compte PPTP"
 
@@ -24,19 +25,19 @@ msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr "Compte PPTP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 msgid "Connectivity addon"
 msgstr "Connectivité"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Mon Compte"
diff --git a/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po
index ce318cab5..3358d8522 100644
--- a/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/it/LC_MESSAGES/messages.po
@@ -6,17 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr ""
 
@@ -25,23 +26,23 @@ msgid "This does something"
 msgstr "Questo fa qualcosa"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 #, fuzzy
 msgid "PPTP account"
 msgstr "Estenzioni FTP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Connettività"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Identità"
 
diff --git a/gosa-plugins/pptp/locale/messages.po b/gosa-plugins/pptp/locale/messages.po
index ab9ce3cbb..d48685164 100644
--- a/gosa-plugins/pptp/locale/messages.po
+++ b/gosa-plugins/pptp/locale/messages.po
@@ -8,16 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr ""
 
@@ -26,19 +27,19 @@ msgid "This does something"
 msgstr ""
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 msgid "LDAP error"
 msgstr ""
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr ""
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr ""
diff --git a/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po
index b05d20b2d..6298a6e83 100644
--- a/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/nl/LC_MESSAGES/messages.po
@@ -11,16 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr "PPTP"
 
@@ -29,22 +30,22 @@ msgid "This does something"
 msgstr "Dit doet iets"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr "PPTP account"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Verbindingen"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Mijn account"
 
diff --git a/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po
index dc4ab9917..f762c0403 100644
--- a/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "X-Poedit-Basepath: tedst\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr "PPTP"
 
@@ -24,22 +25,22 @@ msgid "This does something"
 msgstr "To robi coś"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr "Konto PPTP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Konto połączeń"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Moje konto "
 
diff --git a/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po
index f1f2321cc..7d8cfa305 100644
--- a/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/ru/LC_MESSAGES/messages.po
@@ -5,17 +5,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr ""
 
@@ -24,23 +25,23 @@ msgid "This does something"
 msgstr "Что-то будет"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 #, fuzzy
 msgid "PPTP account"
 msgstr "Аккаунт FTP"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Подключение"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "Моя учетная запись"
 
diff --git a/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po
index 40cc58931..827676f4d 100644
--- a/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pptp/locale/zh/LC_MESSAGES/messages.po
@@ -7,17 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:26
-#: personal/connectivity/pptp/class_pptpAccount.inc:177
+#: personal/connectivity/pptp/class_pptpAccount.inc:175
 msgid "PPTP"
 msgstr "PPTP"
 
@@ -27,22 +28,22 @@ msgid "This does something"
 msgstr "******"
 
 #: personal/connectivity/pptp/class_pptpAccount.inc:102
-#: personal/connectivity/pptp/class_pptpAccount.inc:158
+#: personal/connectivity/pptp/class_pptpAccount.inc:157
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #: personal/connectivity/pptp/pptp.tpl:3
 msgid "PPTP account"
 msgstr "PPTP 账号"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:178
+#: personal/connectivity/pptp/class_pptpAccount.inc:176
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "互联"
 
-#: personal/connectivity/pptp/class_pptpAccount.inc:182
+#: personal/connectivity/pptp/class_pptpAccount.inc:180
 msgid "My account"
 msgstr "我的账号"
 
diff --git a/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po
index bf15f76db..b569aa883 100644
--- a/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 14:25+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgid "This does something"
 msgstr "Dies tut etwas"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -53,48 +54,48 @@ msgid "Quota size"
 msgstr "Kontingent-Größe"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 msgid "Upload ratio"
 msgstr "Upload-Verhältnis"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 msgid "Download ratio"
 msgstr "Download-Verhältnis"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 msgid "Ftp"
 msgstr "FTP"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Pure ftp account"
 msgstr "PureFTP-Konto"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Connectivity addon"
 msgstr "Konnektivitäts-Erweiterung"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 msgid "Quota files"
 msgstr "Kontingent-Dateien"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 msgid "Quota MBytes"
 msgstr "Kontingent-Größe"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 msgid "Upload bandwith"
 msgstr "Upload-Bandbreite"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 msgid "Download bandwith"
 msgstr "Download-Bandbreite"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Status"
 
diff --git a/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po
index 4272b8acd..797771553 100644
--- a/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 01:07+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgid "This does something"
 msgstr "Esto hace algo"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -50,48 +51,48 @@ msgid "Quota size"
 msgstr "Tamaño de la cuota"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 msgid "Upload ratio"
 msgstr "Relación de subida"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 msgid "Download ratio"
 msgstr "Relación de descarga"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 msgid "Ftp"
 msgstr "Ftp"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Pure ftp account"
 msgstr "Cuenta Pure ftp"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Connectivity addon"
 msgstr "Conectividad adicional"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 msgid "Quota files"
 msgstr "Cuota de ficheros"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 msgid "Quota MBytes"
 msgstr "Cuota en Mbytes"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 msgid "Upload bandwith"
 msgstr "Ancho de banda de subida"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 msgid "Download bandwith"
 msgstr "Ancho de banda de descarga"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Estado"
 
diff --git a/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po
index 988ce4be5..527cb204a 100644
--- a/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-07-24 01:32+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@ msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -46,48 +47,48 @@ msgid "Quota size"
 msgstr "Taille du Quota"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 msgid "Upload ratio"
 msgstr "Ratio de Téléchargerment (montée)"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 msgid "Download ratio"
 msgstr "Ratio de téléchargement (descente)"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 msgid "Ftp"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Pure ftp account"
 msgstr "Compte Pure ftp"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Connectivity addon"
 msgstr "Connectivité"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 msgid "Quota files"
 msgstr "Taille du Quota pour les fichiers"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 msgid "Quota MBytes"
 msgstr "Taille du Quota en MBytes"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 msgid "Upload bandwith"
 msgstr "Bande passante montante"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 msgid "Download bandwith"
 msgstr "Bande passante descendante"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Statut"
 
diff --git a/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po
index 9b3052977..a68f5d893 100644
--- a/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgid "This does something"
 msgstr "Questo fa qualcosa"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -50,57 +51,57 @@ msgid "Quota size"
 msgstr "Dimensione quota"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 #, fuzzy
 msgid "Upload ratio"
 msgstr "Banda di upload"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 #, fuzzy
 msgid "Download ratio"
 msgstr "Scarica il file di  configurazione"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 #, fuzzy
 msgid "Ftp"
 msgstr "Tipo"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Pure ftp account"
 msgstr "Crea estensioni FAX"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Connettività"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Identità"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 #, fuzzy
 msgid "Quota files"
 msgstr "Dimensione quota"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 #, fuzzy
 msgid "Quota MBytes"
 msgstr "Dimensione quota"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 #, fuzzy
 msgid "Upload bandwith"
 msgstr "Banda di upload"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 #, fuzzy
 msgid "Download bandwith"
 msgstr "Banda di download"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Stato"
 
diff --git a/gosa-plugins/pureftpd/locale/messages.po b/gosa-plugins/pureftpd/locale/messages.po
index ff76219e5..3cf9fd721 100644
--- a/gosa-plugins/pureftpd/locale/messages.po
+++ b/gosa-plugins/pureftpd/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +26,7 @@ msgid "This does something"
 msgstr ""
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 msgid "LDAP error"
 msgstr ""
 
@@ -48,48 +49,48 @@ msgid "Quota size"
 msgstr ""
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 msgid "Upload ratio"
 msgstr ""
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 msgid "Download ratio"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 msgid "Ftp"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Pure ftp account"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 msgid "Quota files"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 msgid "Quota MBytes"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 msgid "Upload bandwith"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 msgid "Download bandwith"
 msgstr ""
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr ""
 
diff --git a/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po
index 52add3450..ea2503b11 100644
--- a/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +29,7 @@ msgid "This does something"
 msgstr "Dit doet iets"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
@@ -54,57 +55,57 @@ msgid "Quota size"
 msgstr "Quota grootte"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 #, fuzzy
 msgid "Upload ratio"
 msgstr "Uploaden"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 #, fuzzy
 msgid "Download ratio"
 msgstr "Systeem configuratie"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 #, fuzzy
 msgid "Ftp"
 msgstr "FS type"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Pure ftp account"
 msgstr "Fax account aanmaken"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Verbindingen"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 #, fuzzy
 msgid "Quota files"
 msgstr "Quota grootte"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 #, fuzzy
 msgid "Quota MBytes"
 msgstr "Quota grootte"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 #, fuzzy
 msgid "Upload bandwith"
 msgstr "Verstuur bandbreedte"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 #, fuzzy
 msgid "Download bandwith"
 msgstr "Ontvangst bandbreedte"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Status"
 
diff --git a/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po
index db517a19a..d5c8101cd 100644
--- a/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@ msgid "This does something"
 msgstr "To robi coś"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -49,49 +50,49 @@ msgid "Quota size"
 msgstr " Quota pliki"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 msgid "Upload ratio"
 msgstr "Przepustowość wysyłania"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 msgid "Download ratio"
 msgstr "Skala ściągania"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 msgid "Ftp"
 msgstr "FTP"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 msgid "Pure ftp account"
 msgstr "Konto Pure-ftp"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Konto połączeń"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 msgid "Quota files"
 msgstr " Quota pliki"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 msgid "Quota MBytes"
 msgstr "Quota rozmiaru (MB)"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 msgid "Upload bandwith"
 msgstr "Przepustowość wysyłania"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 msgid "Download bandwith"
 msgstr "Przepustowość ściągania"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Status"
 
diff --git a/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po
index 4feaf33c5..cdefc4e3e 100644
--- a/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@ msgid "This does something"
 msgstr "Что-то будет"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -49,57 +50,57 @@ msgid "Quota size"
 msgstr "Размер квоты"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 #, fuzzy
 msgid "Upload ratio"
 msgstr "Загрузка процессора"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 #, fuzzy
 msgid "Download ratio"
 msgstr "Системная информация"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 #, fuzzy
 msgid "Ftp"
 msgstr "Тип"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Pure ftp account"
 msgstr "Создать настройки факса"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Подключение"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 #, fuzzy
 msgid "Quota files"
 msgstr "Размер квоты"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 #, fuzzy
 msgid "Quota MBytes"
 msgstr "Размер квоты"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 #, fuzzy
 msgid "Upload bandwith"
 msgstr "Пропускная способность (на сервер)"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 #, fuzzy
 msgid "Download bandwith"
 msgstr "Пропускная способность (с сервера)"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "Состояние"
 
diff --git a/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po
index 8b16ab072..40e41546b 100644
--- a/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/pureftpd/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "This does something"
 msgstr "******"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:139
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:241
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:235
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -52,57 +53,57 @@ msgid "Quota size"
 msgstr "Quota 大小"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:204
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:272
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
 #, fuzzy
 msgid "Upload ratio"
 msgstr "上传"
 
 #: personal/connectivity/pureftpd/class_pureftpdAccount.inc:207
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:274
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:268
 #, fuzzy
 msgid "Download ratio"
 msgstr "下载配置"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:261
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:255
 #, fuzzy
 msgid "Ftp"
 msgstr "文件系统类型"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Pure ftp account"
 msgstr "创建传真账号"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:262
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:256
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "互联"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:266
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:260
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:265
 #, fuzzy
 msgid "Quota files"
 msgstr "Quota 大小"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:273
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:267
 #, fuzzy
 msgid "Quota MBytes"
 msgstr "Quota 大小"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:275
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:269
 #, fuzzy
 msgid "Upload bandwith"
 msgstr "上传带宽"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:276
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:270
 #, fuzzy
 msgid "Download bandwith"
 msgstr "下载带宽"
 
-#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:277
+#: personal/connectivity/pureftpd/class_pureftpdAccount.inc:271
 msgid "Status"
 msgstr "状态"
 
diff --git a/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po
index 006e8108e..c9afcff99 100644
--- a/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2009-07-03 17:31+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 msgid "Roles"
 msgstr "Rollen"
 
@@ -50,55 +51,60 @@ msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
 "'Abbrechen' zum Abbruch."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Name"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr "Fehler"
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 msgid "Role generic"
 msgstr "Allgemeine Rolleneinstellungen"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Basis"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr "Rollen-Inhaber"
 
@@ -127,110 +133,25 @@ msgid "Remove"
 msgstr "Entfernen"
 
 #: admin/roleManagement/role-list.xml:125
-#, fuzzy
 msgid "Edit role"
-msgstr "ACL-Rolle bearbeiten"
+msgstr "Rolle bearbeiten"
 
 #: admin/roleManagement/role-list.xml:138
-#, fuzzy
 msgid "Remove role"
-msgstr "Benutzer entfernen"
+msgstr "Rolle entfernen"
 
 #: admin/roleManagement/paste_generic.tpl:4
-#, fuzzy
 msgid "Role name"
-msgstr "Rollen-Verwaltung"
+msgstr "Rollen-Name"
 
 #: admin/roleManagement/paste_generic.tpl:7
-#, fuzzy
 msgid "Please enter the new object role name"
-msgstr "Bitte geben Sie einen Namen für die neue Objektgruppe ein"
+msgstr "Bitte geben Sie einen Namen für die neue Rolle ein"
 
 #: admin/roleManagement/role-filter.tpl:3
-#, fuzzy
 msgid "Filter"
 msgstr "Filter"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Wählen Sie den Teilbaum, in den der Benutzer eingepflegt werden soll"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr "Wählen Sie eine Basis"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "Telefonnummer"
-
-#~ msgid "Update"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "Submit"
-#~ msgstr "Übertragen"
-
-#~ msgid "Select objects to add"
-#~ msgstr "Wählen Sie die hinzuzufügenden Objekte"
-
-#~ msgid "Filters"
-#~ msgstr "Filter"
-
-#~ msgid "Select to search within subtrees"
-#~ msgstr "Wählen Sie diese Option um auch in Teilbäumen zu suchen"
-
-#~ msgid "Search in subtrees"
-#~ msgstr "Suche in Teilbäumen"
-
-#~ msgid "Display objects of department"
-#~ msgstr "Zeige die Objekte der Abteilung"
-
-#~ msgid "Choose the department the search will be based on"
-#~ msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
-
-#~ msgid "Display objects matching"
-#~ msgstr "Zeige die Objekte, auf die Folgendes passt"
-
-#~ msgid "Regular expression for matching object names"
-#~ msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
-
-#~ msgid "Manage roles"
-#~ msgstr "Rollen verwalten"
-
-#~ msgid "Permission"
-#~ msgstr "Berechtigung"
-
-#~ msgid "Permission error"
-#~ msgstr "Berechtigungsfehler"
-
-#~ msgid "Group name"
-#~ msgstr "Gruppenname"
-
-#~ msgid "Select all"
-#~ msgstr "Alle auswählen"
-
-#~ msgid "Department"
-#~ msgstr "Abteilung"
-
-#~ msgid "Regular expression for matching role names"
-#~ msgstr "Regulärer Ausdruck zum Erkennen von Rollennamen"
-
-#~ msgid "Submit department"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "edit"
-#~ msgstr "Bearbeiten"
-
-#~ msgid "Edit this entry"
-#~ msgstr "Diesen Eintrag bearbeiten"
-
-#~ msgid "delete"
-#~ msgstr "Entfernen"
-
-#~ msgid "Delete this entry"
-#~ msgstr "Diesen Eintrag entfernen"
-
-#~ msgid "Number of listed roles"
-#~ msgstr "Anzahl der angezeigten Rollen"
-
-#~ msgid "Number of listed departments"
-#~ msgstr "Anzahl der angezeigten Abteilungen"
diff --git a/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po
index 964eaacda..782220dbc 100644
--- a/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/en/LC_MESSAGES/messages.po
@@ -1,5 +1,5 @@
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 msgid "Roles"
 msgstr ""
 
@@ -21,55 +21,60 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 msgid "LDAP error"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr ""
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 msgid "Role generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 msgid "Telefon number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 msgid "Fax number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -117,14 +122,6 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr ""
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr ""
diff --git a/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po
index d807f5352..d78977cd3 100644
--- a/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-28 23:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 msgid "Roles"
 msgstr "Roles"
 
@@ -45,55 +46,60 @@ msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr "Error"
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Genérico"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 msgid "Role generic"
 msgstr "Rol genérico"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Base"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr "Ocupantes"
 
@@ -141,18 +147,16 @@ msgstr "Por favor introduzca un nuevo objeto nombre de rol"
 msgid "Filter"
 msgstr "Filtro"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Elija el subárbol donde colocar al usuario"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr "Seleccione una base"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "Número de teléfono"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Elija el subárbol donde colocar al usuario"
+
+#~ msgid "Select a base"
+#~ msgstr "Seleccione una base"
+
 #~ msgid "Update"
 #~ msgstr "Actualizar"
 
diff --git a/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po
index 93ee28815..0a8a205cc 100644
--- a/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-22 21:13+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 msgid "Roles"
 msgstr "Rôles"
 
@@ -42,55 +43,60 @@ msgstr ""
 "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
 "'Annuler' pour abandonner."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Nom"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr "Erreur"
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 msgid "Role generic"
 msgstr "Rôle par défaut"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr "Membres"
 
@@ -138,18 +144,16 @@ msgstr "Veuillez entrer un nouveau nom pour le rôle"
 msgid "Filter"
 msgstr "Filtre"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr "Sélectionnez une base"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
+
+#~ msgid "Select a base"
+#~ msgstr "Sélectionnez une base"
+
 #~ msgid "Update"
 #~ msgstr "Mise à jour"
 
diff --git a/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po
index 7e58f47a2..4a1d774d7 100644
--- a/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/it/LC_MESSAGES/messages.po
@@ -6,17 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 #, fuzzy
 msgid "Roles"
 msgstr "Ruolo"
@@ -43,59 +44,64 @@ msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Cognome"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr ""
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Generale"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 #, fuzzy
 msgid "Role generic"
 msgstr "Cognome"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Base"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -149,19 +155,17 @@ msgstr "Inserisci la URI del server LDAP"
 msgid "Filter"
 msgstr "Filtri"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Scegli il subtree per l'utente"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-#, fuzzy
-msgid "Select a base"
-msgstr "Rimuovi"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "Numero di telefono"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Scegli il subtree per l'utente"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Rimuovi"
+
 #~ msgid "Filters"
 #~ msgstr "Filtri"
 
diff --git a/gosa-plugins/rolemanagement/locale/messages.po b/gosa-plugins/rolemanagement/locale/messages.po
index dd280af38..5b045e7fe 100644
--- a/gosa-plugins/rolemanagement/locale/messages.po
+++ b/gosa-plugins/rolemanagement/locale/messages.po
@@ -8,16 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 msgid "Roles"
 msgstr ""
 
@@ -39,55 +40,60 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 msgid "LDAP error"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr ""
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 msgid "Role generic"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 msgid "Telefon number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 msgid "Fax number"
 msgstr ""
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -135,14 +141,6 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr ""
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr ""
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr ""
diff --git a/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po
index 9d9f97efa..72fdd67c7 100644
--- a/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/nl/LC_MESSAGES/messages.po
@@ -11,16 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 #, fuzzy
 msgid "Roles"
 msgstr "Funktie"
@@ -48,59 +49,64 @@ msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
 "om te annuleren."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Naam"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr "Fout"
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Algemeen"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 #, fuzzy
 msgid "Role generic"
 msgstr "Hernoemen"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Basis"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -154,18 +160,16 @@ msgstr "Geef a.u.b. een nieuwe naam op"
 msgid "Filter"
 msgstr "Filters"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr "Selecteer een basis"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
+
+#~ msgid "Select a base"
+#~ msgstr "Selecteer een basis"
+
 #~ msgid "Submit"
 #~ msgstr "Verwerk"
 
diff --git a/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po
index 5c1cc5bdb..323f060b1 100644
--- a/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "X-Poedit-Basepath: tedst\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 #, fuzzy
 msgid "Roles"
 msgstr "Pełniona funkcja"
@@ -41,57 +42,62 @@ msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
 "anulować."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Imię"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr "Błąd"
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Ogólne"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 #, fuzzy
 msgid "Role generic"
 msgstr "Zmień nazwę"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Opis"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Kontener"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -145,18 +151,16 @@ msgstr "Proszę podać nową nazwę."
 msgid "Filter"
 msgstr "Filtry"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Wybierz poddrzewo do umieszczenia konta."
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr "Wybierz bazę"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "Numer telefonu"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia konta."
+
+#~ msgid "Select a base"
+#~ msgstr "Wybierz bazę"
+
 #~ msgid "Update"
 #~ msgstr "Aktualizuj"
 
diff --git a/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po
index 80ea4fe5a..6d923b8d1 100644
--- a/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/ru/LC_MESSAGES/messages.po
@@ -5,17 +5,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 #, fuzzy
 msgid "Roles"
 msgstr "Роль"
@@ -44,60 +45,65 @@ msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 #, fuzzy
 msgid "Unknown"
 msgstr "состояние неизвестно"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr ""
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "Общее"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 #, fuzzy
 msgid "Role generic"
 msgstr "Имя сервера"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "Описание"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "Ветка"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -151,20 +157,18 @@ msgstr "Введите адрес сервера"
 msgid "Filter"
 msgstr "Фильтры"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "Выберите ветку для пользователя"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-#, fuzzy
-msgid "Select a base"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 #, fuzzy
 msgid "Phone number"
 msgstr "Телефонные номера"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "Выберите ветку для пользователя"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Выберите, чтобы просмотреть серверы"
+
 #~ msgid "Select objects to add"
 #~ msgstr "Выбрать объекты для добавления"
 
diff --git a/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po
index 878e6f0d3..c4b9f9702 100644
--- a/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rolemanagement/locale/zh/LC_MESSAGES/messages.po
@@ -7,17 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: admin/roleManagement/class_roleManagement.inc:25
-#: admin/roleManagement/class_roleGeneric.inc:406
+#: admin/roleManagement/class_roleGeneric.inc:427
 #, fuzzy
 msgid "Roles"
 msgstr "角色"
@@ -41,59 +42,64 @@ msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
-#: admin/roleManagement/class_roleGeneric.inc:225
-#: admin/roleManagement/class_roleGeneric.inc:234
-#: admin/roleManagement/class_roleGeneric.inc:409
+#: admin/roleManagement/class_roleGeneric.inc:238
+#: admin/roleManagement/class_roleGeneric.inc:247
+#: admin/roleManagement/class_roleGeneric.inc:430
 #: admin/roleManagement/role-list.xml:41
+#: admin/roleManagement/role-filter.tpl:17
 #: admin/roleManagement/roleGeneric.tpl:11
 msgid "Name"
 msgstr "名称"
 
-#: admin/roleManagement/class_roleGeneric.inc:255
+#: admin/roleManagement/class_roleGeneric.inc:268
 msgid "Unknown"
 msgstr "未知"
 
-#: admin/roleManagement/class_roleGeneric.inc:273
-#: admin/roleManagement/class_roleGeneric.inc:315
+#: admin/roleManagement/class_roleGeneric.inc:286
+#: admin/roleManagement/class_roleGeneric.inc:328
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/roleManagement/class_roleGeneric.inc:400
+#: admin/roleManagement/class_roleGeneric.inc:371
+msgid "Error"
+msgstr "错误"
+
+#: admin/roleManagement/class_roleGeneric.inc:421
 #: admin/roleManagement/roleGeneric.tpl:6
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/roleManagement/class_roleGeneric.inc:401
+#: admin/roleManagement/class_roleGeneric.inc:422
 #, fuzzy
 msgid "Role generic"
 msgstr "重命名"
 
-#: admin/roleManagement/class_roleGeneric.inc:410
+#: admin/roleManagement/class_roleGeneric.inc:431
 #: admin/roleManagement/role-list.xml:49
 #: admin/roleManagement/roleGeneric.tpl:19
 msgid "Description"
 msgstr "描述"
 
-#: admin/roleManagement/class_roleGeneric.inc:411
+#: admin/roleManagement/class_roleGeneric.inc:432
 #: admin/roleManagement/role-list.tpl:13
 #: admin/roleManagement/roleGeneric.tpl:29
 msgid "Base"
 msgstr "位置"
 
-#: admin/roleManagement/class_roleGeneric.inc:412
+#: admin/roleManagement/class_roleGeneric.inc:433
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: admin/roleManagement/class_roleGeneric.inc:413
-#: admin/roleManagement/roleGeneric.tpl:56
+#: admin/roleManagement/class_roleGeneric.inc:434
+#: admin/roleManagement/roleGeneric.tpl:50
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: admin/roleManagement/class_roleGeneric.inc:414
-#: admin/roleManagement/roleGeneric.tpl:68
+#: admin/roleManagement/class_roleGeneric.inc:435
+#: admin/roleManagement/roleGeneric.tpl:62
 msgid "Occupants"
 msgstr ""
 
@@ -147,18 +153,16 @@ msgstr "请输入新对象组名称"
 msgid "Filter"
 msgstr "过滤器"
 
-#: admin/roleManagement/roleGeneric.tpl:34
-msgid "Choose subtree to place user in"
-msgstr "将用户放到所选择子树中"
-
-#: admin/roleManagement/roleGeneric.tpl:40
-msgid "Select a base"
-msgstr "选择一个位置"
-
-#: admin/roleManagement/roleGeneric.tpl:48
+#: admin/roleManagement/roleGeneric.tpl:42
 msgid "Phone number"
 msgstr "电话号码"
 
+#~ msgid "Choose subtree to place user in"
+#~ msgstr "将用户放到所选择子树中"
+
+#~ msgid "Select a base"
+#~ msgstr "选择一个位置"
+
 #~ msgid "Submit"
 #~ msgstr "提交"
 
diff --git a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
index 2dc00fb08..f53ccc546 100644
--- a/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rsyslog/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2009-10-05 15:19+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,100 +101,100 @@ msgstr "%s Einträge passten auf den Filter"
 msgid "The selected server '%s' does not exists!"
 msgstr "Der ausgewählte Server '%s' existiert nicht!"
 
-#: addons/rsyslog/class_rsyslog.inc:304
+#: addons/rsyslog/class_rsyslog.inc:314
 msgid "Emergency"
 msgstr "Notfall"
 
-#: addons/rsyslog/class_rsyslog.inc:305
+#: addons/rsyslog/class_rsyslog.inc:315
 msgid "Alert"
 msgstr "Alarm"
 
-#: addons/rsyslog/class_rsyslog.inc:306
+#: addons/rsyslog/class_rsyslog.inc:316
 msgid "Critical"
 msgstr "Kritisch"
 
-#: addons/rsyslog/class_rsyslog.inc:307 addons/rsyslog/rSyslog.tpl:62
+#: addons/rsyslog/class_rsyslog.inc:317 addons/rsyslog/rSyslog.tpl:62
 msgid "Error"
 msgstr "Fehler"
 
-#: addons/rsyslog/class_rsyslog.inc:308
+#: addons/rsyslog/class_rsyslog.inc:318
 msgid "Warning"
 msgstr "Warnung"
 
-#: addons/rsyslog/class_rsyslog.inc:309
+#: addons/rsyslog/class_rsyslog.inc:319
 msgid "Notice"
 msgstr "Hinweis"
 
-#: addons/rsyslog/class_rsyslog.inc:310
+#: addons/rsyslog/class_rsyslog.inc:320
 msgid "Informational"
 msgstr "Informativ"
 
-#: addons/rsyslog/class_rsyslog.inc:311
+#: addons/rsyslog/class_rsyslog.inc:321
 msgid "Debug"
 msgstr "Fehlersuche"
 
-#: addons/rsyslog/class_rsyslog.inc:317 addons/rsyslog/class_rsyslog.inc:352
+#: addons/rsyslog/class_rsyslog.inc:327 addons/rsyslog/class_rsyslog.inc:362
 #, php-format
 msgid "Unknown (%s)"
 msgstr "Unbekannt (%s)"
 
-#: addons/rsyslog/class_rsyslog.inc:323
+#: addons/rsyslog/class_rsyslog.inc:333
 msgid "Kernel"
 msgstr "Kern"
 
-#: addons/rsyslog/class_rsyslog.inc:324
+#: addons/rsyslog/class_rsyslog.inc:334
 msgid "User level"
 msgstr "Benutzer Ebene"
 
-#: addons/rsyslog/class_rsyslog.inc:325
+#: addons/rsyslog/class_rsyslog.inc:335
 msgid "Mail system"
 msgstr "Mailsystem"
 
-#: addons/rsyslog/class_rsyslog.inc:326
+#: addons/rsyslog/class_rsyslog.inc:336
 msgid "System daemon"
 msgstr "Systemdienste"
 
-#: addons/rsyslog/class_rsyslog.inc:327 addons/rsyslog/class_rsyslog.inc:333
+#: addons/rsyslog/class_rsyslog.inc:337 addons/rsyslog/class_rsyslog.inc:343
 msgid "Security"
 msgstr "Sicherheit"
 
-#: addons/rsyslog/class_rsyslog.inc:328
+#: addons/rsyslog/class_rsyslog.inc:338
 msgid "Internal"
 msgstr "Intern"
 
-#: addons/rsyslog/class_rsyslog.inc:329
+#: addons/rsyslog/class_rsyslog.inc:339
 msgid "Printing"
 msgstr "Drucksystem"
 
-#: addons/rsyslog/class_rsyslog.inc:330
+#: addons/rsyslog/class_rsyslog.inc:340
 msgid "News"
 msgstr "Newssystem"
 
-#: addons/rsyslog/class_rsyslog.inc:331
+#: addons/rsyslog/class_rsyslog.inc:341
 msgid "UUCP"
 msgstr "UUCP"
 
-#: addons/rsyslog/class_rsyslog.inc:332
+#: addons/rsyslog/class_rsyslog.inc:342
 msgid "Cron"
 msgstr "Cron"
 
-#: addons/rsyslog/class_rsyslog.inc:334
+#: addons/rsyslog/class_rsyslog.inc:344
 msgid "FTP"
 msgstr "FTP"
 
-#: addons/rsyslog/class_rsyslog.inc:335
+#: addons/rsyslog/class_rsyslog.inc:345
 msgid "NTP"
 msgstr "NTP"
 
-#: addons/rsyslog/class_rsyslog.inc:336
+#: addons/rsyslog/class_rsyslog.inc:346
 msgid "Log audit"
 msgstr "Log audit"
 
-#: addons/rsyslog/class_rsyslog.inc:337
+#: addons/rsyslog/class_rsyslog.inc:347
 msgid "Log alert"
 msgstr "Log alarm"
 
-#: addons/rsyslog/class_rsyslog.inc:338
+#: addons/rsyslog/class_rsyslog.inc:348
 msgid "Clock"
 msgstr "Zeit"
 
diff --git a/gosa-plugins/rsyslog/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/rsyslog/locale/fr/LC_MESSAGES/messages.po
index 725dac725..e405adfca 100644
--- a/gosa-plugins/rsyslog/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/rsyslog/locale/fr/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-22 21:15+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,100 +101,100 @@ msgstr "%s entrées correspondent au filtre"
 msgid "The selected server '%s' does not exists!"
 msgstr "Le serveur '%s' n'existe pas !"
 
-#: addons/rsyslog/class_rsyslog.inc:304
+#: addons/rsyslog/class_rsyslog.inc:314
 msgid "Emergency"
 msgstr "Urgence"
 
-#: addons/rsyslog/class_rsyslog.inc:305
+#: addons/rsyslog/class_rsyslog.inc:315
 msgid "Alert"
 msgstr "Alerte"
 
-#: addons/rsyslog/class_rsyslog.inc:306
+#: addons/rsyslog/class_rsyslog.inc:316
 msgid "Critical"
 msgstr "Critique"
 
-#: addons/rsyslog/class_rsyslog.inc:307 addons/rsyslog/rSyslog.tpl:62
+#: addons/rsyslog/class_rsyslog.inc:317 addons/rsyslog/rSyslog.tpl:62
 msgid "Error"
 msgstr "Erreur"
 
-#: addons/rsyslog/class_rsyslog.inc:308
+#: addons/rsyslog/class_rsyslog.inc:318
 msgid "Warning"
 msgstr "Avertissement"
 
-#: addons/rsyslog/class_rsyslog.inc:309
+#: addons/rsyslog/class_rsyslog.inc:319
 msgid "Notice"
 msgstr "Remarque"
 
-#: addons/rsyslog/class_rsyslog.inc:310
+#: addons/rsyslog/class_rsyslog.inc:320
 msgid "Informational"
 msgstr "Information"
 
-#: addons/rsyslog/class_rsyslog.inc:311
+#: addons/rsyslog/class_rsyslog.inc:321
 msgid "Debug"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:317 addons/rsyslog/class_rsyslog.inc:352
+#: addons/rsyslog/class_rsyslog.inc:327 addons/rsyslog/class_rsyslog.inc:362
 #, php-format
 msgid "Unknown (%s)"
 msgstr "Inconnu (%s)"
 
-#: addons/rsyslog/class_rsyslog.inc:323
+#: addons/rsyslog/class_rsyslog.inc:333
 msgid "Kernel"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:324
+#: addons/rsyslog/class_rsyslog.inc:334
 msgid "User level"
 msgstr "Niveau utilisateur"
 
-#: addons/rsyslog/class_rsyslog.inc:325
+#: addons/rsyslog/class_rsyslog.inc:335
 msgid "Mail system"
 msgstr "Système de messagerie"
 
-#: addons/rsyslog/class_rsyslog.inc:326
+#: addons/rsyslog/class_rsyslog.inc:336
 msgid "System daemon"
 msgstr "Service système"
 
-#: addons/rsyslog/class_rsyslog.inc:327 addons/rsyslog/class_rsyslog.inc:333
+#: addons/rsyslog/class_rsyslog.inc:337 addons/rsyslog/class_rsyslog.inc:343
 msgid "Security"
 msgstr "Sécurité"
 
-#: addons/rsyslog/class_rsyslog.inc:328
+#: addons/rsyslog/class_rsyslog.inc:338
 msgid "Internal"
 msgstr "Interne"
 
-#: addons/rsyslog/class_rsyslog.inc:329
+#: addons/rsyslog/class_rsyslog.inc:339
 msgid "Printing"
 msgstr "Drucksystem"
 
-#: addons/rsyslog/class_rsyslog.inc:330
+#: addons/rsyslog/class_rsyslog.inc:340
 msgid "News"
 msgstr "Nouvelles"
 
-#: addons/rsyslog/class_rsyslog.inc:331
+#: addons/rsyslog/class_rsyslog.inc:341
 msgid "UUCP"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:332
+#: addons/rsyslog/class_rsyslog.inc:342
 msgid "Cron"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:334
+#: addons/rsyslog/class_rsyslog.inc:344
 msgid "FTP"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:335
+#: addons/rsyslog/class_rsyslog.inc:345
 msgid "NTP"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:336
+#: addons/rsyslog/class_rsyslog.inc:346
 msgid "Log audit"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:337
+#: addons/rsyslog/class_rsyslog.inc:347
 msgid "Log alert"
 msgstr ""
 
-#: addons/rsyslog/class_rsyslog.inc:338
+#: addons/rsyslog/class_rsyslog.inc:348
 msgid "Clock"
 msgstr "Heure"
 
diff --git a/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
index 1db0a8682..0bf88e829 100644
--- a/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2009-06-22 15:55+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,8 +41,8 @@ msgstr "Netzwerk"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
@@ -71,12 +72,12 @@ msgid "Generic"
 msgstr "Allgemein"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Domäne"
 
@@ -89,8 +90,8 @@ msgid "Script path"
 msgstr "Anmeldeskript"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Profil-Pfad"
 
@@ -98,11 +99,11 @@ msgstr "Profil-Pfad"
 msgid "Terminal Server"
 msgstr "Terminal-Server"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Anmeldung am Terminalserver zulassen"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Client-Konfiguration übernehmen"
 
@@ -118,18 +119,18 @@ msgstr "Arbeitsverzeichnis"
 msgid "Timeout settings (in minutes)"
 msgstr "Zeitlimit (in Minuten)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Verbinden"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Trennen"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "Leerlauf"
 
@@ -169,43 +170,43 @@ msgstr "Wiederherstellen falls unterbrochen"
 msgid "Access options"
 msgstr "Zugriffsoptionen"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 msgid "Enforce password change"
 msgstr "Erzwinge Änderung des Passwortes"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 msgid "The password never expires"
 msgstr "Passwort läuft nie ab"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "Die Anmeldung vom Windows-Client erfordert kein Passwort"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "Samba-Konto sperren"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 msgid "Cannot change password"
 msgstr "Passworänderung unterbinden"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Samba logon times"
 msgstr "Samba Anmeldezeiten"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Edit settings..."
 msgstr "Einstellungen bearbeiten..."
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 msgid "Used by all users"
 msgstr "Verwendet von allen Benutzern"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr "Verwendet von einigen Benutzern"
 
@@ -218,14 +219,14 @@ msgid "Hour"
 msgstr "Stunde"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -233,309 +234,294 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Dies tut etwas"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "Eingabe EIN, Benachrichtigen EIN"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "Eingabe EIN, Benachrichtigen AUS"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "Eingabe AUS, Benachrichtigen EIN"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "Eingabe AUS, Benachrichtigen AUS"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "trennen"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "zurücksetzen"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "von jedem Client"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "nur von vorherigem Client"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Das Passwort ist aufgrund der Domänen-Richtline seit %s abgelaufen."
 
-#: personal/samba/class_sambaAccount.inc:574
-#, php-format
-msgid "The password is valid till %s, by user policy."
-msgstr "Das Passwort ist aufgrund der Benutzer-Richtline bis %s gültig."
-
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr "Das Passwort ist aufgrund der Domänen-Richtline bis %s gültig."
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:518
+msgid "The password is valid till %s."
+msgstr "Das Passwort ist bis %s gültig."
+
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "default"
 msgstr "Standard"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 msgid "Off"
 msgstr "Aus"
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 msgid "On"
 msgstr "An"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr "Sekunden"
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 msgid "minutes"
 msgstr "Minuten"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 msgid "forever"
 msgstr "dauerhaft"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "off"
 msgstr "aus"
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 msgid "on"
 msgstr "an"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 msgid "unset"
 msgstr "nicht gesetzt"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr "sofort"
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 msgid "days"
 msgstr "Tage"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 msgid "hours"
 msgstr "Stunden"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 msgid "Domain attributes"
 msgstr "Eigenschaften der Domäne"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 msgid "Min password length"
 msgstr "Minimale Passwort-Länge"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 msgid "Password history"
 msgstr "Passwort-Historie"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 msgid "Force password change"
 msgstr "Erzwinge Änderung des Passwortes"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 msgid "Maximum password age"
 msgstr "Maximales Passwort-Alter"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 msgid "Minimum password age"
 msgstr "Minimales Passwort-Alter"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 msgid "Lockout duration"
 msgstr "Dauer der Sperre"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr "Aussperren nach Anzahl fehlgeschlagener Anmeldungen"
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 msgid "Disconnect time"
 msgstr "Zeit bis automatische Trennung"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 msgid "Refuse machine password change"
 msgstr "Verweigere Änderung der Passwörter für Computerkonten"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 msgid "User attributes"
 msgstr "Eigenschaften des Benutzers"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 msgid "SID"
 msgstr "SID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Last failed login"
 msgstr "Letzter Fehlschlag der Anmeldung"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 msgid "Logon attempts"
 msgstr "Anmeldeversuche"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 msgid "Last password update"
 msgstr "Letzte Passwortänderung"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 msgid "Last logon"
 msgstr "Letztes Login"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 msgid "Last logoff"
 msgstr "Letzte Abmeldung"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 msgid "Automatic logoff"
 msgstr "Automatische Abmeldung"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 msgid "Password expires"
 msgstr "Passwort läuft ab"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr "nein"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr ""
 "Das Passwort läuft am %s ab, aber ablaufende Passwörter sind deaktiviert."
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 msgid "Password change available"
 msgstr "Passwort-Änderung möglich"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 msgid "Home drive"
 msgstr "Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 msgid "Home path"
 msgstr "Basis-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "Konto läuft ab am"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "Passwort läuft ab am"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Die Benutzerverwaltung von Windows erlaubt höchstens acht Clients!"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Information"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Warnung"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Undefinierte Samba SID festgestellt. Bitte beheben Sie dieses Problem "
 "manuell!"
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kann primäre Gruppe nicht in Samba-Gruppe überführen: die Gruppe kann nicht "
 "identifiziert werden!"
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba-Einstellungen"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Mein Konto"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 msgid "Generic home directory"
 msgstr "Allgemeines Basisverzeichnis"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr "Allgemeines Samba Basis-Laufwerk"
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 msgid "Generic script path"
 msgstr "Allgemeiner Skript-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 msgid "Generic profile path"
 msgstr "Allgemeiner Profil-Pfad"
 
-#: personal/samba/class_sambaAccount.inc:1380
-msgid "Allow user to change password"
-msgstr "Benutzer darf sein Passwort ändern"
+#: personal/samba/class_sambaAccount.inc:1173
+msgid "Disallow password change"
+msgstr "Änderung des Passwortes verbieten"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 msgid "Password never expires"
 msgstr "Passwort läuft nie ab"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 msgid "Logon hours"
 msgstr "Anmeldezeiten"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 msgid "Allow connection from"
 msgstr "Erlaube Verbindung von"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -563,6 +549,18 @@ msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
 msgid "Regular expression for matching addresses"
 msgstr "Regulärer Ausdruck zum Erkennen von Mail-Adressen"
 
+#~ msgid "The password is valid till %s, by domain policy."
+#~ msgstr "Das Passwort ist aufgrund der Domänen-Richtline bis %s gültig."
+
+#~ msgid "Account expires after"
+#~ msgstr "Konto läuft ab am"
+
+#~ msgid "Password expires on"
+#~ msgstr "Passwort läuft ab am"
+
+#~ msgid "Allow user to change password"
+#~ msgstr "Benutzer darf sein Passwort ändern"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "Wählen Sie den Teilbaum, in den die Gruppe eingepflegt werden soll"
 
diff --git a/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
index 6b59766c4..eaa477d99 100644
--- a/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/es/LC_MESSAGES/messages.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-28 23:56+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,8 +40,8 @@ msgstr "red"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 msgid "LDAP error"
 msgstr "Error LDAP"
 
@@ -70,12 +71,12 @@ msgid "Generic"
 msgstr "Genérico"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Dominio"
 
@@ -88,8 +89,8 @@ msgid "Script path"
 msgstr "Ruta del Script"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -97,11 +98,11 @@ msgstr "Ruta del Perfil"
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Permitir inicio de sesión en el servidor de terminal"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Configuración predeterminada de cliente"
 
@@ -117,18 +118,18 @@ msgstr "Directorio de trabajo"
 msgid "Timeout settings (in minutes)"
 msgstr "Tiempo de desconexión (en minutos)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Conexión"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Desconexión"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -168,45 +169,45 @@ msgstr "Conectar si se desconecta"
 msgid "Access options"
 msgstr "Opciones de acceso"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 #, fuzzy
 msgid "Enforce password change"
 msgstr "Forzar el cambio de contraseña"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 msgid "The password never expires"
 msgstr "La contraseña nunca expira"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en windows no necesita contraseña"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 #, fuzzy
 msgid "Cannot change password"
 msgstr "Cambiar contraseña"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Samba logon times"
 msgstr "Intentos de inicio de sesión de Samba"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Edit settings..."
 msgstr "Editar configuración..."
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 msgid "Used by all users"
 msgstr "Usado por todos los usuarios"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr "Usado por algunos usuarios"
 
@@ -220,14 +221,14 @@ msgid "Hour"
 msgstr "Hora"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -235,312 +236,299 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Esto hace algo"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "desactivado"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "entrada activada, notificación activada"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "entrada activada, notificación desactivada"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "entrada desactivada, notificación activada"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "entrada desactivada, notificación desactivada"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "desconectar"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "Borrar"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "desde cualquier cliente"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "La nueva contraseña está caducada desde %s, por política de dominio."
 
-#: personal/samba/class_sambaAccount.inc:574
-#, php-format
-msgid "The password is valid till %s, by user policy."
+#: personal/samba/class_sambaAccount.inc:518
+#, fuzzy, php-format
+msgid "The password is valid till %s."
 msgstr "La contraseña es válida hasta %s, por política de usuario."
 
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr "La contraseña es válida hasta %s, por política de dominio."
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "default"
 msgstr "predeterminado"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 msgid "Off"
 msgstr "Off"
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 msgid "On"
 msgstr "On"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr "segundos"
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 msgid "minutes"
 msgstr "minutos"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 msgid "forever"
 msgstr "sin limite"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "off"
 msgstr "inactivo"
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 msgid "on"
 msgstr "activo"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 msgid "unset"
 msgstr "quitar"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr "inmediatamente"
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 msgid "days"
 msgstr "días"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 msgid "hours"
 msgstr "horas"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 msgid "Domain attributes"
 msgstr "Características del dominio"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 msgid "Min password length"
 msgstr "Longitud mínima de la contraseña"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 msgid "Password history"
 msgstr "Histórico de contraseñas"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 msgid "Force password change"
 msgstr "Forzar el cambio de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 msgid "Maximum password age"
 msgstr "Fecha máxima de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 msgid "Minimum password age"
 msgstr "Fecha mínima de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 msgid "Lockout duration"
 msgstr "Duración del bloqueo"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr "Bloqueo por Intentos erróneos"
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 msgid "Disconnect time"
 msgstr "Tiempo de desconexión"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 msgid "Refuse machine password change"
 msgstr "No se permite modificar la contraseña de máquina"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 msgid "User attributes"
 msgstr "Atributo de usuario"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 msgid "SID"
 msgstr "SID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Last failed login"
 msgstr "Último inicio de sesión fallido"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 msgid "Logon attempts"
 msgstr "Intentos de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 msgid "Last password update"
 msgstr "Actualizar última contraseña"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 msgid "Last logon"
 msgstr "Último inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 msgid "Last logoff"
 msgstr "Último cierre de sesión"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 msgid "Automatic logoff"
 msgstr "Cierre de sesión automático"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 msgid "Password expires"
 msgstr "La contraseña expira en"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr "No"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr ""
 "La contraseña debió caducar en %s, pero caducidad de contraseña esta "
 "desactivada."
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 msgid "Password change available"
 msgstr "Cambio de contraseña permitido"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 msgid "Home drive"
 msgstr "Unidad inicial"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 msgid "Home path"
 msgstr "Ruta inicial"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "La cuenta caducará después de"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "La contraseña caduca en"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "¡El administrador de usuarios de windows solo permite ocho clientes como "
 "máximo!"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Información"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Aviso"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Se ha detectado un SID Samba sin definir. ¡Por favor solucione este problema "
 "manualmente!"
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "No se puede convertir un grupo primario a grupo samba: ¡El grupo no puede "
 "ser identificado!"
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 msgid "Generic home directory"
 msgstr "Directorio predeterminado de usuario"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr "Unidad predeterminada de usuario samba"
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 msgid "Generic script path"
 msgstr "Ruta predeterminada del Script"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 msgid "Generic profile path"
 msgstr "Ruta predeterminada del Perfil"
 
-#: personal/samba/class_sambaAccount.inc:1380
-msgid "Allow user to change password"
-msgstr "Permitir al usuario cambiar su contraseña"
+#: personal/samba/class_sambaAccount.inc:1173
+#, fuzzy
+msgid "Disallow password change"
+msgstr "Forzar el cambio de contraseña"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 msgid "Password never expires"
 msgstr "La contraseña nunca expira"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 msgid "Logon hours"
 msgstr "Horario de inicio de sesión"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 msgid "Allow connection from"
 msgstr "Permitir la conexión desde"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -568,6 +556,18 @@ msgstr "Escoja el departamento base de la búsqueda"
 msgid "Regular expression for matching addresses"
 msgstr "Expresión regular para buscar direcciones"
 
+#~ msgid "The password is valid till %s, by domain policy."
+#~ msgstr "La contraseña es válida hasta %s, por política de dominio."
+
+#~ msgid "Account expires after"
+#~ msgstr "La cuenta caducará después de"
+
+#~ msgid "Password expires on"
+#~ msgstr "La contraseña caduca en"
+
+#~ msgid "Allow user to change password"
+#~ msgstr "Permitir al usuario cambiar su contraseña"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "Elija lugar del árbol para colocar el grupo"
 
diff --git a/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
index c719a8cac..bae765103 100644
--- a/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-08-06 11:40+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,8 +35,8 @@ msgstr "réseau"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
@@ -65,12 +66,12 @@ msgid "Generic"
 msgstr "Informations"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Répertoire Home"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Domaine"
 
@@ -83,8 +84,8 @@ msgid "Script path"
 msgstr "Chemin du Script"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Chemin du Profile"
 
@@ -92,11 +93,11 @@ msgstr "Chemin du Profile"
 msgid "Terminal Server"
 msgstr "Serveur de terminaux"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Permet la connexion sur un serveur de terminaux"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Hérite de la configuration du client"
 
@@ -112,18 +113,18 @@ msgstr "Répertoire de travail"
 msgid "Timeout settings (in minutes)"
 msgstr "Configuration du temps d'attente (en minutes)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Connexion"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Déconnexion"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "En attente"
 
@@ -163,43 +164,44 @@ msgstr "Reconnexion si déconnecté"
 msgid "Access options"
 msgstr "Options d'accès"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 msgid "Enforce password change"
 msgstr "Forcer le changement de mot de passe"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 msgid "The password never expires"
 msgstr "Le mot de passe n'expire jamais"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
-msgstr "L'identification sur une station windows ne nécessite pas de mot de passe"
+msgstr ""
+"L'identification sur une station windows ne nécessite pas de mot de passe"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "Verrouiller le compte Samba"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 msgid "Cannot change password"
 msgstr "Interdire le changement de mot de passe"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Samba logon times"
 msgstr "Heures d'accès à Samba"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Edit settings..."
 msgstr "Editer les paramètres..."
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 msgid "Used by all users"
 msgstr "Utilisé par tout les utilisateurs"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr "Utilisé par certains utilisateurs"
 
@@ -212,14 +214,14 @@ msgid "Hour"
 msgstr "Heure"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr ""
 
@@ -227,307 +229,299 @@ msgstr ""
 msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr "UNIX"
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "désactivé"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "entrée activée, notification activée"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "entrée activée, notification désactivée"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "entrée désactivée, notification activée"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "entrée désactivée, notification désactivée"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "déconnecté"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "remise à zéro"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "de n'importe quel client"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "du client précédent seulement"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
-msgstr "Le mot de passe est trop vieux depuis %s selon à la politique du domaine."
-
-#: personal/samba/class_sambaAccount.inc:574
-#, php-format
-msgid "The password is valid till %s, by user policy."
-msgstr "Le mot de passe est valide jusqu'au %s, suivant la politique utilisateur."
+msgstr ""
+"Le mot de passe est trop vieux depuis %s selon à la politique du domaine."
 
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr "Le mot de passe est valide jusqu'au %s, selon la politique du domaine."
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:518
+#, fuzzy, php-format
+msgid "The password is valid till %s."
+msgstr ""
+"Le mot de passe est valide jusqu'au %s, suivant la politique utilisateur."
+
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "default"
 msgstr "défaut"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 msgid "Off"
 msgstr "Eteint"
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 msgid "On"
 msgstr "Ouvert"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr "secondes"
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 msgid "minutes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 msgid "forever"
 msgstr "indéfiniment"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "off"
 msgstr "Éteint"
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 msgid "on"
 msgstr "Allumé"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 msgid "unset"
 msgstr "non configuré"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr "immédiatement"
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 msgid "days"
 msgstr "jours"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 msgid "hours"
 msgstr "heures"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 msgid "Domain attributes"
 msgstr "Attributs domaines"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 msgid "Min password length"
 msgstr "Taille minimale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 msgid "Password history"
 msgstr "Historique des mots de passe"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 msgid "Force password change"
 msgstr "Forcer le changement de mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 msgid "Maximum password age"
 msgstr "Durée de vie maximale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 msgid "Minimum password age"
 msgstr "Durée de vie minimale du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 msgid "Lockout duration"
 msgstr "La durée de blocage"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr "Nombre de tentatives avant blocage"
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 msgid "Disconnect time"
 msgstr "Forcer la déconnexion"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 msgid "Refuse machine password change"
 msgstr "Refuser le changement de mot de passe de la machine"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 msgid "User attributes"
 msgstr "Attributs de l'utilisateur"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Last failed login"
 msgstr "Dernière connexion ayant échouée"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 msgid "Logon attempts"
 msgstr "Nombre de tentative de connexion"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 msgid "Last password update"
 msgstr "Dernière mise à jour du mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 msgid "Last logon"
 msgstr "Dernière connexion"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 msgid "Last logoff"
 msgstr "Dernière déconnexion"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 msgid "Automatic logoff"
 msgstr "Déconnexion Automatique"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 msgid "Password expires"
 msgstr "Le mot de passe expirera le"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr "Non"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
-msgstr "Le mot de passe devrait expirer le %s, mais l'expiration est désactivée."
+msgstr ""
+"Le mot de passe devrait expirer le %s, mais l'expiration est désactivée."
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 msgid "Password change available"
 msgstr "Le changement du mot est disponible"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 msgid "Home drive"
 msgstr "Répertoire Home"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 msgid "Home path"
 msgstr "Chemin du répertoire personnel"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "Le compte expire après"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "Le mot de passe expirera le"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "Le gestionnaire d'utilisateurs windows accepte seulement huit clients. Vous "
 "en avez spécifiés plus de huit."
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Information"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Avertissement"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
-msgstr "Détection d'un SID Samba non défini. Veuillez fixer ceci manuellement !"
+msgstr ""
+"Détection d'un SID Samba non défini. Veuillez fixer ceci manuellement !"
 
-#: personal/samba/class_sambaAccount.inc:1191
-msgid "Cannot convert primary group to samba group: group cannot be identified!"
+#: personal/samba/class_sambaAccount.inc:1055
+msgid ""
+"Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Impossible de convertir le groupe primaire en un groupe primaire samba : le "
 "groupe ne peut être identifié !"
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Configuration Samba"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Mon Compte"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 msgid "Generic home directory"
 msgstr "Répertoire Home de base"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr "Lecteur réseau par défaut"
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 msgid "Generic script path"
 msgstr "Chemin du script par défaut"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 msgid "Generic profile path"
 msgstr "Chemin par défaut du profil"
 
-#: personal/samba/class_sambaAccount.inc:1380
-msgid "Allow user to change password"
-msgstr "Autoriser les utilisateurs à changer de mot de passe"
+#: personal/samba/class_sambaAccount.inc:1173
+#, fuzzy
+msgid "Disallow password change"
+msgstr "Forcer le changement de mot de passe"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 msgid "Password never expires"
 msgstr "Le mot de passe n'expire jamais"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 msgid "Logon hours"
 msgstr "Heure de connexions"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 msgid "Allow connection from"
 msgstr "Permettre la connexion depuis"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -555,3 +549,15 @@ msgstr "Sélectionner le département où sera effectuée la recherche"
 msgid "Regular expression for matching addresses"
 msgstr "Expression régulière pour sélectionner les adresses correspondantes"
 
+#~ msgid "The password is valid till %s, by domain policy."
+#~ msgstr ""
+#~ "Le mot de passe est valide jusqu'au %s, selon la politique du domaine."
+
+#~ msgid "Account expires after"
+#~ msgstr "Le compte expire après"
+
+#~ msgid "Password expires on"
+#~ msgstr "Le mot de passe expirera le"
+
+#~ msgid "Allow user to change password"
+#~ msgstr "Autoriser les utilisateurs à changer de mot de passe"
diff --git a/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
index 35999a4ae..f091c283c 100644
--- a/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,8 +38,8 @@ msgstr "Aggiungi contatto"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
@@ -72,12 +73,12 @@ msgid "Generic"
 msgstr "Generale"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Home directory"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Dominio"
 
@@ -91,8 +92,8 @@ msgid "Script path"
 msgstr "Script path"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Path del profilo"
 
@@ -100,11 +101,11 @@ msgstr "Path del profilo"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Permetti la connessione al Terminal Server"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Eredita la configurazione del client"
 
@@ -120,18 +121,18 @@ msgstr "Cartella di lavoro"
 msgid "Timeout settings (in minutes)"
 msgstr "Timeout (in minuti)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Connessione"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Disconnessione "
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr ""
 
@@ -172,49 +173,49 @@ msgstr ""
 msgid "Access options"
 msgstr "Opzioni di accesso"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 #, fuzzy
 msgid "Enforce password change"
 msgstr "Cambia la password"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 #, fuzzy
 msgid "The password never expires"
 msgstr "La password spira il"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "L'accesso ai client Windows non richiede password"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "Blocca l'account samba"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 #, fuzzy
 msgid "Cannot change password"
 msgstr "Cambia la password"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Gruppo Samba"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Opzioni di posta dell'identità"
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Permetti la connessione solo da queste workstation"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 #, fuzzy
 msgid "Used by all users"
 msgstr "Utenti di Dominio"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr ""
 
@@ -229,14 +230,14 @@ msgid "Hour"
 msgstr "ora"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -244,341 +245,327 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Questo fa qualcosa"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "disabilitato"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "input on, notifica on"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "input on, notifica off"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "input off, notifica on"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "input off, notifica off"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "disconnetti"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "reset"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "da qualsiasi client "
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "solo dal client precedente"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
-#: personal/samba/class_sambaAccount.inc:574
-#, php-format
-msgid "The password is valid till %s, by user policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr ""
+#: personal/samba/class_sambaAccount.inc:518
+#, fuzzy, php-format
+msgid "The password is valid till %s."
+msgstr "La 'Nuova password' immessa è troppo corta."
 
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "default"
 msgstr "elimina"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 #, fuzzy
 msgid "On"
 msgstr "Opzioni"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 #, fuzzy
 msgid "minutes"
 msgstr "Stampante"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 #, fuzzy
 msgid "forever"
 msgstr "Server"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 #, fuzzy
 msgid "on"
 msgstr "Dominio"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 #, fuzzy
 msgid "unset"
 msgstr "Giugno"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 #, fuzzy
 msgid "days"
 msgstr "giorno"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 #, fuzzy
 msgid "hours"
 msgstr "ora"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "Min password length"
 msgstr "Algorimo password"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 #, fuzzy
 msgid "Password history"
 msgstr "Algorimo password"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 #, fuzzy
 msgid "Force password change"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Password dell'amministratore"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Località"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Disconnessione "
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 #, fuzzy
 msgid "User attributes"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Last failed login"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Attributo DN delle persone"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "Last password update"
 msgstr "Nuova password"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 #, fuzzy
 msgid "Last logon"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 #, fuzzy
 msgid "Last logoff"
 msgstr "Scegli il tuo numero di telefono personale"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatico"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 #, fuzzy
 msgid "Password expires"
 msgstr "La password spira il"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 #, fuzzy
 msgid "No"
 msgstr "nessuno"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 #, fuzzy
 msgid "Password change available"
 msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 #, fuzzy
 msgid "Home drive"
 msgstr "Home directory"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 #, fuzzy
 msgid "Home path"
 msgstr "Telefono privato"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "L'account spira dopo"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "La password spira il"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Informazioni"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Attenzione"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Impostazioni Samba"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Identità"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Home directory"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 #, fuzzy
 msgid "Generic script path"
 msgstr "Script path"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Path del profilo"
 
-#: personal/samba/class_sambaAccount.inc:1380
+#: personal/samba/class_sambaAccount.inc:1173
 #, fuzzy
-msgid "Allow user to change password"
-msgstr "Permetti all'utente di cambiare la propria password da un client"
+msgid "Disallow password change"
+msgstr "Cambia la password"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 #, fuzzy
 msgid "Password never expires"
 msgstr "La password spira il"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 #, fuzzy
 msgid "Logon hours"
 msgstr "ora"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permetti la connessione solo da queste workstation"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -604,6 +591,16 @@ msgstr "Scegli il dipartimento di base per la ricerca"
 msgid "Regular expression for matching addresses"
 msgstr "Espressione regolare per selezionare l'indirizzo"
 
+#~ msgid "Account expires after"
+#~ msgstr "L'account spira dopo"
+
+#~ msgid "Password expires on"
+#~ msgstr "La password spira il"
+
+#, fuzzy
+#~ msgid "Allow user to change password"
+#~ msgstr "Permetti all'utente di cambiare la propria password da un client"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "Scegli il subtree dove mettere il gruppo"
 
diff --git a/gosa-plugins/samba/locale/messages.po b/gosa-plugins/samba/locale/messages.po
index f45439593..46e515c2b 100644
--- a/gosa-plugins/samba/locale/messages.po
+++ b/gosa-plugins/samba/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,8 +37,8 @@ msgstr ""
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 msgid "LDAP error"
 msgstr ""
 
@@ -67,12 +68,12 @@ msgid "Generic"
 msgstr ""
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr ""
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr ""
 
@@ -85,8 +86,8 @@ msgid "Script path"
 msgstr ""
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr ""
 
@@ -94,11 +95,11 @@ msgstr ""
 msgid "Terminal Server"
 msgstr ""
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr ""
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr ""
 
@@ -114,18 +115,18 @@ msgstr ""
 msgid "Timeout settings (in minutes)"
 msgstr ""
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr ""
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr ""
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr ""
 
@@ -165,43 +166,43 @@ msgstr ""
 msgid "Access options"
 msgstr ""
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 msgid "Enforce password change"
 msgstr ""
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 msgid "The password never expires"
 msgstr ""
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr ""
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr ""
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 msgid "Cannot change password"
 msgstr ""
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Samba logon times"
 msgstr ""
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Edit settings..."
 msgstr ""
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr ""
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 msgid "Used by all users"
 msgstr ""
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr ""
 
@@ -214,14 +215,14 @@ msgid "Hour"
 msgstr ""
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr ""
 
@@ -229,304 +230,290 @@ msgstr ""
 msgid "This does something"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:574
-#, php-format
-msgid "The password is valid till %s, by user policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:577
+#: personal/samba/class_sambaAccount.inc:518
 #, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+msgid "The password is valid till %s."
+msgstr ""
+
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "default"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 msgid "On"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 msgid "minutes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 msgid "forever"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 msgid "on"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 msgid "unset"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 msgid "days"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 msgid "hours"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 msgid "Domain attributes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 msgid "Min password length"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 msgid "Password history"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 msgid "Force password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 msgid "Maximum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 msgid "Minimum password age"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 msgid "Lockout duration"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 msgid "Disconnect time"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 msgid "Refuse machine password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 msgid "User attributes"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 msgid "SID"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 msgid "Last failed login"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 msgid "Logon attempts"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 msgid "Last password update"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 msgid "Last logon"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 msgid "Last logoff"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 msgid "Automatic logoff"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 msgid "Password expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 msgid "Password change available"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 msgid "Home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 msgid "Home path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 msgid "Generic home directory"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 msgid "Generic script path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 msgid "Generic profile path"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1380
-msgid "Allow user to change password"
+#: personal/samba/class_sambaAccount.inc:1173
+msgid "Disallow password change"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 msgid "Password never expires"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 msgid "Logon hours"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 msgid "Allow connection from"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
diff --git a/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
index 5e41efbcd..e8fe24ddf 100644
--- a/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-09 17:22+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,8 +40,8 @@ msgstr "netwerk"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 msgid "LDAP error"
 msgstr "LDAP fout"
 
@@ -70,12 +71,12 @@ msgid "Generic"
 msgstr "Algemeen"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Domein"
 
@@ -89,8 +90,8 @@ msgid "Script path"
 msgstr "Inlogscript"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Profielpad"
 
@@ -98,11 +99,11 @@ msgstr "Profielpad"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Sta inloggen op de Terminal Server toe"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Client configuratie voor initieel programma overnemen"
 
@@ -118,18 +119,18 @@ msgstr "Werkmap"
 msgid "Timeout settings (in minutes)"
 msgstr "Terminal Service timeouts (in minuten)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Max. verbindingsduur"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Max. verbrekingsduur"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "Max. inactiviteitsduur"
 
@@ -169,46 +170,46 @@ msgstr "Herstel sessie indien verbroken"
 msgid "Access options"
 msgstr "Toegangsopties"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 #, fuzzy
 msgid "Enforce password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 #, fuzzy
 msgid "The password never expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "Blokkeer Samba/Windows account"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 #, fuzzy
 msgid "Cannot change password"
 msgstr "Verander wachtwoord"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Samba logon times"
 msgstr "Samba inlog tijdstippen"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Edit settings..."
 msgstr "Instellingen bewerken..."
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 msgid "Used by all users"
 msgstr "Gebruikt door alle gebruikers"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr "Gebruikt door sommige gebruikers"
 
@@ -221,14 +222,14 @@ msgid "Hour"
 msgstr "Uur"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -236,339 +237,326 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Dit doet iets"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "invoer met notificatie"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "invoer zonder notificatie"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "geen invoer met notificatie"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "geen invoer zonder notificatie"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "verbreken"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "herstellen"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "vanaf elke client"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "alleen vanaf vorige client"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
-#: personal/samba/class_sambaAccount.inc:574
+#: personal/samba/class_sambaAccount.inc:518
 #, fuzzy, php-format
-msgid "The password is valid till %s, by user policy."
+msgid "The password is valid till %s."
 msgstr "De sieve poort dient nummeriek te zijn."
 
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "default"
 msgstr "Verwijder"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 #, fuzzy
 msgid "On"
 msgstr "Open"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 #, fuzzy
 msgid "minutes"
 msgstr "Printer"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 #, fuzzy
 msgid "forever"
 msgstr "Server"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 #, fuzzy
 msgid "on"
 msgstr "Omlaag"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 #, fuzzy
 msgid "unset"
 msgstr "herstellen"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 #, fuzzy
 msgid "days"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 #, fuzzy
 msgid "hours"
 msgstr "Uur"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "Min password length"
 msgstr "Wachtwoord encryptie"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 #, fuzzy
 msgid "Password history"
 msgstr "Wachtwoord encryptie"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 #, fuzzy
 msgid "Force password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Beheerders wachtwoord"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Plaats"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Max. verbrekingsduur"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 #, fuzzy
 msgid "User attributes"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Last failed login"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Telefoon attributen "
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "Last password update"
 msgstr "Nieuw wachtwoord"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 #, fuzzy
 msgid "Last logon"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 #, fuzzy
 msgid "Last logoff"
 msgstr "Achternaam"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatisch"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 msgid "Password expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr "Nee"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 #, fuzzy
 msgid "Password change available"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 #, fuzzy
 msgid "Home drive"
 msgstr "Persoonlijke map"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 #, fuzzy
 msgid "Home path"
 msgstr "Telefoon Privé"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "Het account verloopt op"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "Wachtwoord verloopt op"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Het Windows gebruikersbeheer programma staat slechts acht clients toe!"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Informatie"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 "Er is een ongedefinieerd SambaSID geselecteerd. Repareer dit probleem a.u.b. "
 "handmatig!"
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 "Kan primaire groep niet in een samba groep omzetten: group kan niet "
 "geidentificeerd worden"
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba Instellingen"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Mijn account"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 msgid "Generic home directory"
 msgstr "Algemene persoonlijke map"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr "Algemeen persoonlijk schijfstation"
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 msgid "Generic script path"
 msgstr "Algemeen scriptpad"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 msgid "Generic profile path"
 msgstr "Windows werkstation"
 
-#: personal/samba/class_sambaAccount.inc:1380
-msgid "Allow user to change password"
-msgstr "Gebruiker mag het wachtwoord wijzigen"
+#: personal/samba/class_sambaAccount.inc:1173
+#, fuzzy
+msgid "Disallow password change"
+msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 #, fuzzy
 msgid "Password never expires"
 msgstr "Algemeen profielpad"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 msgid "Logon hours"
 msgstr "Inlog tijden"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 msgid "Allow connection from"
 msgstr "Sta verbinding toe vanaf"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -596,6 +584,15 @@ msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
 msgid "Regular expression for matching addresses"
 msgstr "Reguliere expresie voor overeenkomende adressen"
 
+#~ msgid "Account expires after"
+#~ msgstr "Het account verloopt op"
+
+#~ msgid "Password expires on"
+#~ msgstr "Wachtwoord verloopt op"
+
+#~ msgid "Allow user to change password"
+#~ msgstr "Gebruiker mag het wachtwoord wijzigen"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 
diff --git a/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
index 0537930fc..05ddfcb42 100644
--- a/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -35,8 +36,8 @@ msgstr "Dodaj inwentarz"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
@@ -70,12 +71,12 @@ msgid "Generic"
 msgstr "Ogólne"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Domena"
 
@@ -89,8 +90,8 @@ msgid "Script path"
 msgstr "Ścieżka do skryptu"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Ścieżka do profilu"
 
@@ -98,11 +99,11 @@ msgstr "Ścieżka do profilu"
 msgid "Terminal Server"
 msgstr "Terminal Server"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Zezwól na logowanie do serwera terminali"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Odziedzicz konfigurację klienta"
 
@@ -118,18 +119,18 @@ msgstr "Katalog roboczy"
 msgid "Timeout settings (in minutes)"
 msgstr "Ustawienia Timeoutu (w minutach)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Połączenie"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Rozłączenie"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "BEZCZYNNY"
 
@@ -169,49 +170,49 @@ msgstr "Połącz jeśli rozłączono"
 msgid "Access options"
 msgstr "Opcje dostępu"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 #, fuzzy
 msgid "Enforce password change"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 #, fuzzy
 msgid "The password never expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "Logowanie z klienta windows nie wymaga hasła"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "Zablokuj konto samba"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 #, fuzzy
 msgid "Cannot change password"
 msgstr "Zmień hasło"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Typ grupy Samba"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Ustawienia pocztowe"
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Zezwól na połączenia tylko z tych stacji"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 #, fuzzy
 msgid "Used by all users"
 msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr ""
 
@@ -226,14 +227,14 @@ msgid "Hour"
 msgstr "godzina"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -241,338 +242,325 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "To robi coś"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr "POSIX"
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "wyłączone"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "input tak, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "input tak, notify nie"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "input nie, notify tak"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "input nie, notify nie"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "rozłącz"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "resetuj"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "z każdego klienta"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "tylko z poprzedniego klienta"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
-#: personal/samba/class_sambaAccount.inc:574
+#: personal/samba/class_sambaAccount.inc:518
 #, fuzzy, php-format
-msgid "The password is valid till %s, by user policy."
+msgid "The password is valid till %s."
 msgstr "Port sieve musi być liczbą."
 
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "default"
 msgstr "Usuń"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 #, fuzzy
 msgid "Off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 #, fuzzy
 msgid "On"
 msgstr "Otwórz"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 #, fuzzy
 msgid "minutes"
 msgstr "Drukarka"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 #, fuzzy
 msgid "forever"
 msgstr "Serwer"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "off"
 msgstr "Offline"
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 #, fuzzy
 msgid "on"
 msgstr "W dół"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 #, fuzzy
 msgid "unset"
 msgstr "Czerwiec"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 #, fuzzy
 msgid "days"
 msgstr "dzień"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 #, fuzzy
 msgid "hours"
 msgstr "godzina"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "Min password length"
 msgstr "Przechowywanie hasła"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 #, fuzzy
 msgid "Password history"
 msgstr "Przechowywanie hasła"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 #, fuzzy
 msgid "Force password change"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Hasło Administratora"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Lokalizacja"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Rozłączenie"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 #, fuzzy
 msgid "User attributes"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Last failed login"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Atrybuty telefonu"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "Last password update"
 msgstr "Nowe hasło"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 #, fuzzy
 msgid "Last logon"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 #, fuzzy
 msgid "Last logoff"
 msgstr "Nazwisko"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "automatyczne"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 msgid "Password expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr "Nie"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "Hasło które podano jako 'Nowe hasło' jest puste."
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 #, fuzzy
 msgid "Password change available"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 #, fuzzy
 msgid "Home drive"
 msgstr "Katalog domowy"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 #, fuzzy
 msgid "Home path"
 msgstr "Telefon domowy"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "Konto wygasa po"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "Hasło wygasa"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "User manager w windows zezwala tylko na 8 klientów. Podano więcej niż 8."
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Informacja"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Ustawienia Samba"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Moje konto "
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 msgid "Generic home directory"
 msgstr "Ogólny katalog domowy"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr "Podstawowy dysk domowy samba"
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 msgid "Generic script path"
 msgstr "Ogólna ścieżka do skryptu"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 msgid "Generic profile path"
 msgstr "Ogólna ścieżka do profilu"
 
-#: personal/samba/class_sambaAccount.inc:1380
-msgid "Allow user to change password"
-msgstr "Zezwól użytkownikowi na zmianę hasła"
+#: personal/samba/class_sambaAccount.inc:1173
+#, fuzzy
+msgid "Disallow password change"
+msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 #, fuzzy
 msgid "Password never expires"
 msgstr "Hasło wygasa"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 #, fuzzy
 msgid "Logon hours"
 msgstr "jedna godzina"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 msgid "Allow connection from"
 msgstr "Zezwól na połączenia z"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -599,6 +587,15 @@ msgstr "Wybierz departament na którym wyszukiwanie będzie bazować"
 msgid "Regular expression for matching addresses"
 msgstr "Wyrażenie regularne dla dopasowania adresów"
 
+#~ msgid "Account expires after"
+#~ msgstr "Konto wygasa po"
+
+#~ msgid "Password expires on"
+#~ msgstr "Hasło wygasa"
+
+#~ msgid "Allow user to change password"
+#~ msgstr "Zezwól użytkownikowi na zmianę hasła"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "Wybierz poddrzewo do umieszczenia grupy"
 
diff --git a/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
index 7d1c383e3..9b3bf53bc 100644
--- a/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,8 +37,8 @@ msgstr "Добавить объект"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
@@ -71,12 +72,12 @@ msgid "Generic"
 msgstr "Общее"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "Домен"
 
@@ -90,8 +91,8 @@ msgid "Script path"
 msgstr "Путь к сценариям"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Путь к профилю"
 
@@ -99,11 +100,11 @@ msgstr "Путь к профилю"
 msgid "Terminal Server"
 msgstr "Терминальный сервер"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "Разрешить вход на терминальный сервер"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "Унаследовать конфигурацию клиента"
 
@@ -119,18 +120,18 @@ msgstr "Рабочий каталог"
 msgid "Timeout settings (in minutes)"
 msgstr "Настройки таймаута (в минутах)"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "Подключение"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "Отключение"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "Простой"
 
@@ -170,50 +171,50 @@ msgstr "В"
 msgid "Access options"
 msgstr "Параметры доступа"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 #, fuzzy
 msgid "Enforce password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 #, fuzzy
 msgid "The password never expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "Не спрашивать пароль при входе в систему из Windows"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 #, fuzzy
 msgid "Lock samba account"
 msgstr "Удалить учетную запись Samba"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 #, fuzzy
 msgid "Cannot change password"
 msgstr "Сменить пароль"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 #, fuzzy
 msgid "Samba logon times"
 msgstr "Группа Samba"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 #, fuzzy
 msgid "Edit settings..."
 msgstr "Почтовые настройки пользователя"
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 #, fuzzy
 msgid "Used by all users"
 msgstr "Пользователи домена"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr ""
 
@@ -228,14 +229,14 @@ msgid "Hour"
 msgstr "час"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -243,347 +244,332 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "Что-то будет"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "отключен"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "входящие вкл, оповещение вкл"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "входящие вкл, оповещение выкл"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "входящие выкл, оповещение вкл"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "входящие выкл, оповещение выкл"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "отключиться"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "сброс"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "от любого клиента"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "только от предыдущего клиента"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "Новый пароль слишком короткий."
 
-#: personal/samba/class_sambaAccount.inc:574
+#: personal/samba/class_sambaAccount.inc:518
 #, fuzzy, php-format
-msgid "The password is valid till %s, by user policy."
+msgid "The password is valid till %s."
 msgstr "Значение поля \"Квота\" некорректно."
 
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "default"
 msgstr "Удалить"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 #, fuzzy
 msgid "Off"
 msgstr "не в сети"
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 #, fuzzy
 msgid "On"
 msgstr "Параметры"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 #, fuzzy
 msgid "minutes"
 msgstr "Принтер"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 #, fuzzy
 msgid "forever"
 msgstr "Сервер"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "off"
 msgstr "не в сети"
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 #, fuzzy
 msgid "on"
 msgstr "Домен"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 #, fuzzy
 msgid "unset"
 msgstr "Июнь"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 #, fuzzy
 msgid "days"
 msgstr "день"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 #, fuzzy
 msgid "hours"
 msgstr "час"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 #, fuzzy
 msgid "Domain attributes"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "Min password length"
 msgstr "Хэширование паролей"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 #, fuzzy
 msgid "Password history"
 msgstr "Хэширование паролей"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 #, fuzzy
 msgid "Force password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 #, fuzzy
 msgid "Maximum password age"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 #, fuzzy
 msgid "Minimum password age"
 msgstr "Пароль администратора"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 #, fuzzy
 msgid "Lockout duration"
 msgstr "Местоположение"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 #, fuzzy
 msgid "Disconnect time"
 msgstr "Отключение"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 #, fuzzy
 msgid "User attributes"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Last failed login"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 #, fuzzy
 msgid "Logon attempts"
 msgstr "Атрибут DN пользователей"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "Last password update"
 msgstr "Новый пароль"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 #, fuzzy
 msgid "Last logon"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 #, fuzzy
 msgid "Last logoff"
 msgstr "Список"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "автоматически"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 #, fuzzy
 msgid "Password expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 #, fuzzy
 msgid "No"
 msgstr "нет"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "Вы не указали новый пароль."
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 #, fuzzy
 msgid "Password change available"
 msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 #, fuzzy
 msgid "Home drive"
 msgstr "Домашний каталог"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 #, fuzzy
 msgid "Home path"
 msgstr "Домашний телефон"
 
-#: personal/samba/class_sambaAccount.inc:950
-#, fuzzy
-msgid "Account expires after"
-msgstr "Учетная запись"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "Срок действия пароля истекает"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr ""
 "Менеджер пользователей Windows допускает подключение только восми клиентов. "
 "Вы указали больше чем восем."
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "Информация"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Настройки Samba"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Домашний каталог"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 #, fuzzy
 msgid "Generic script path"
 msgstr "Путь к сценариям"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Путь к профилю"
 
-#: personal/samba/class_sambaAccount.inc:1380
+#: personal/samba/class_sambaAccount.inc:1173
 #, fuzzy
-msgid "Allow user to change password"
-msgstr "Разрешить пользователям менять пароль с клиента"
+msgid "Disallow password change"
+msgstr "Сменить пароль"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 #, fuzzy
 msgid "Password never expires"
 msgstr "Срок действия пароля истекает"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 #, fuzzy
 msgid "Logon hours"
 msgstr "один час"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -611,6 +597,17 @@ msgstr "Выбрать раздел, для которого будет осущ
 msgid "Regular expression for matching addresses"
 msgstr "Регулярное выражение для поиска адреса"
 
+#, fuzzy
+#~ msgid "Account expires after"
+#~ msgstr "Учетная запись"
+
+#~ msgid "Password expires on"
+#~ msgstr "Срок действия пароля истекает"
+
+#, fuzzy
+#~ msgid "Allow user to change password"
+#~ msgstr "Разрешить пользователям менять пароль с клиента"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "Выберите ветку для группы"
 
diff --git a/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
index 6ae23d175..edb3f2345 100644
--- a/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/samba/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 20:41+0200\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,8 +38,8 @@ msgstr "添加清单(inventory)"
 
 #: admin/systems/samba/class_winGeneric.inc:148
 #: admin/systems/samba/class_winGeneric.inc:296
-#: personal/samba/class_sambaAccount.inc:908
-#: personal/samba/class_sambaAccount.inc:1267
+#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:1089
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
@@ -72,12 +73,12 @@ msgid "Generic"
 msgstr "通用配置"
 
 #: personal/samba/samba3.tpl:13 personal/samba/samba3.tpl:109
-#: personal/samba/class_sambaAccount.inc:931
-#: personal/samba/class_sambaAccount.inc:1423
+#: personal/samba/class_sambaAccount.inc:864
+#: personal/samba/class_sambaAccount.inc:1216
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1375
+#: personal/samba/samba3.tpl:26 personal/samba/class_sambaAccount.inc:1166
 msgid "Domain"
 msgstr "域"
 
@@ -91,8 +92,8 @@ msgid "Script path"
 msgstr "脚本路径"
 
 #: personal/samba/samba3.tpl:55 personal/samba/samba3.tpl:122
-#: personal/samba/class_sambaAccount.inc:932
-#: personal/samba/class_sambaAccount.inc:1424
+#: personal/samba/class_sambaAccount.inc:865
+#: personal/samba/class_sambaAccount.inc:1217
 msgid "Profile path"
 msgstr "Profile path"
 
@@ -100,11 +101,11 @@ msgstr "Profile path"
 msgid "Terminal Server"
 msgstr "终端服务器"
 
-#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1378
+#: personal/samba/samba3.tpl:106 personal/samba/class_sambaAccount.inc:1169
 msgid "Allow login on terminal server"
 msgstr "允许登录到终端服务器"
 
-#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1379
+#: personal/samba/samba3.tpl:143 personal/samba/class_sambaAccount.inc:1170
 msgid "Inherit client config"
 msgstr "继承客户配置"
 
@@ -120,18 +121,18 @@ msgstr "工作目录"
 msgid "Timeout settings (in minutes)"
 msgstr "超时设置（分钟）"
 
-#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:939
-#: personal/samba/class_sambaAccount.inc:1431
+#: personal/samba/samba3.tpl:187 personal/samba/class_sambaAccount.inc:872
+#: personal/samba/class_sambaAccount.inc:1224
 msgid "Connection"
 msgstr "连接"
 
-#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:940
-#: personal/samba/class_sambaAccount.inc:1432
+#: personal/samba/samba3.tpl:201 personal/samba/class_sambaAccount.inc:873
+#: personal/samba/class_sambaAccount.inc:1225
 msgid "Disconnection"
 msgstr "断开"
 
-#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:941
-#: personal/samba/class_sambaAccount.inc:1433
+#: personal/samba/samba3.tpl:215 personal/samba/class_sambaAccount.inc:874
+#: personal/samba/class_sambaAccount.inc:1226
 msgid "IDLE"
 msgstr "闲"
 
@@ -172,47 +173,47 @@ msgstr "断线重连"
 msgid "Access options"
 msgstr "访问选项"
 
-#: personal/samba/samba3.tpl:324 personal/samba/class_sambaAccount.inc:1385
+#: personal/samba/samba3.tpl:325 personal/samba/class_sambaAccount.inc:1172
 #, fuzzy
 msgid "Enforce password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/samba3.tpl:334
+#: personal/samba/samba3.tpl:336
 #, fuzzy
 msgid "The password never expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/samba3.tpl:344 personal/samba/class_sambaAccount.inc:1381
+#: personal/samba/samba3.tpl:347 personal/samba/class_sambaAccount.inc:1174
 msgid "Login from windows client requires no password"
 msgstr "从 Windows 客户端登录不需要口令"
 
-#: personal/samba/samba3.tpl:354 personal/samba/class_sambaAccount.inc:1383
+#: personal/samba/samba3.tpl:358 personal/samba/class_sambaAccount.inc:1176
 msgid "Lock samba account"
 msgstr "锁定 samba 账号"
 
-#: personal/samba/samba3.tpl:365 personal/samba/class_sambaAccount.inc:1386
+#: personal/samba/samba3.tpl:369
 #, fuzzy
 msgid "Cannot change password"
 msgstr "修改口令"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Samba logon times"
 msgstr "Samba 登录次数"
 
-#: personal/samba/samba3.tpl:382
+#: personal/samba/samba3.tpl:386
 msgid "Edit settings..."
 msgstr "编辑设置..."
 
-#: personal/samba/samba3.tpl:391
+#: personal/samba/samba3.tpl:395
 msgid "Allow connection from these workstations only"
 msgstr "只允许从这些工作站建立连接"
 
-#: personal/samba/samba3.tpl:402
+#: personal/samba/samba3.tpl:406
 #, fuzzy
 msgid "Used by all users"
 msgstr "域用户"
 
-#: personal/samba/samba3.tpl:405
+#: personal/samba/samba3.tpl:409
 msgid "Used by some users"
 msgstr ""
 
@@ -225,14 +226,14 @@ msgid "Hour"
 msgstr "小时"
 
 #: personal/samba/class_sambaAccount.inc:24
-#: personal/samba/class_sambaAccount.inc:210
-#: personal/samba/class_sambaAccount.inc:222
-#: personal/samba/class_sambaAccount.inc:223
-#: personal/samba/class_sambaAccount.inc:232
-#: personal/samba/class_sambaAccount.inc:233
 #: personal/samba/class_sambaAccount.inc:235
-#: personal/samba/class_sambaAccount.inc:236
-#: personal/samba/class_sambaAccount.inc:1362
+#: personal/samba/class_sambaAccount.inc:247
+#: personal/samba/class_sambaAccount.inc:248
+#: personal/samba/class_sambaAccount.inc:255
+#: personal/samba/class_sambaAccount.inc:256
+#: personal/samba/class_sambaAccount.inc:258
+#: personal/samba/class_sambaAccount.inc:259
+#: personal/samba/class_sambaAccount.inc:1153
 msgid "Samba"
 msgstr "Samba"
 
@@ -241,341 +242,327 @@ msgstr "Samba"
 msgid "This does something"
 msgstr "******"
 
-#: personal/samba/class_sambaAccount.inc:236
+#: personal/samba/class_sambaAccount.inc:259
 msgid "POSIX"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:399
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:744
+#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:677
 msgid "disabled"
 msgstr "禁用"
 
-#: personal/samba/class_sambaAccount.inc:400
+#: personal/samba/class_sambaAccount.inc:407
 msgid "input on, notify on"
 msgstr "输入打开，通知打开"
 
-#: personal/samba/class_sambaAccount.inc:401
+#: personal/samba/class_sambaAccount.inc:408
 msgid "input on, notify off"
 msgstr "输入打开，通知关闭"
 
-#: personal/samba/class_sambaAccount.inc:402
+#: personal/samba/class_sambaAccount.inc:409
 msgid "input off, notify on"
 msgstr "输入关闭，通知打开"
 
-#: personal/samba/class_sambaAccount.inc:403
+#: personal/samba/class_sambaAccount.inc:410
 msgid "input off, nofify off"
 msgstr "输入关闭，通知关闭"
 
-#: personal/samba/class_sambaAccount.inc:405
+#: personal/samba/class_sambaAccount.inc:412
 msgid "disconnect"
 msgstr "断开"
 
-#: personal/samba/class_sambaAccount.inc:406
+#: personal/samba/class_sambaAccount.inc:413
 msgid "reset"
 msgstr "重置"
 
-#: personal/samba/class_sambaAccount.inc:408
+#: personal/samba/class_sambaAccount.inc:414
 msgid "from any client"
 msgstr "从任意客户"
 
-#: personal/samba/class_sambaAccount.inc:409
+#: personal/samba/class_sambaAccount.inc:415
 msgid "from previous client only"
 msgstr "只从上一个客户"
 
-#: personal/samba/class_sambaAccount.inc:570
+#: personal/samba/class_sambaAccount.inc:515
 #, fuzzy, php-format
 msgid "The password is outdated since %s, by domain policy."
 msgstr "输入的新口令太短了。"
 
-#: personal/samba/class_sambaAccount.inc:574
+#: personal/samba/class_sambaAccount.inc:518
 #, fuzzy, php-format
-msgid "The password is valid till %s, by user policy."
+msgid "The password is valid till %s."
 msgstr "Sieve 端口应为数字。"
 
-#: personal/samba/class_sambaAccount.inc:577
-#, php-format
-msgid "The password is valid till %s, by domain policy."
-msgstr ""
-
-#: personal/samba/class_sambaAccount.inc:698
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
-#: personal/samba/class_sambaAccount.inc:718
-#: personal/samba/class_sambaAccount.inc:726
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:744
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:631
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
+#: personal/samba/class_sambaAccount.inc:651
+#: personal/samba/class_sambaAccount.inc:659
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:677
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 #, fuzzy
 msgid "default"
 msgstr "删除"
 
-#: personal/samba/class_sambaAccount.inc:704
-#: personal/samba/class_sambaAccount.inc:710
+#: personal/samba/class_sambaAccount.inc:637
+#: personal/samba/class_sambaAccount.inc:643
 msgid "Off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:712
+#: personal/samba/class_sambaAccount.inc:645
 #, fuzzy
 msgid "On"
 msgstr "打开"
 
-#: personal/samba/class_sambaAccount.inc:720
-#: personal/samba/class_sambaAccount.inc:728
+#: personal/samba/class_sambaAccount.inc:653
+#: personal/samba/class_sambaAccount.inc:661
 msgid "seconds"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:734
-#: personal/samba/class_sambaAccount.inc:738
-#: personal/samba/class_sambaAccount.inc:830
+#: personal/samba/class_sambaAccount.inc:667
+#: personal/samba/class_sambaAccount.inc:671
+#: personal/samba/class_sambaAccount.inc:763
 #, fuzzy
 msgid "minutes"
 msgstr "打印机"
 
-#: personal/samba/class_sambaAccount.inc:736
+#: personal/samba/class_sambaAccount.inc:669
 #, fuzzy
 msgid "forever"
 msgstr "服务器"
 
-#: personal/samba/class_sambaAccount.inc:750
-#: personal/samba/class_sambaAccount.inc:758
+#: personal/samba/class_sambaAccount.inc:683
+#: personal/samba/class_sambaAccount.inc:691
 msgid "off"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:752
-#: personal/samba/class_sambaAccount.inc:760
+#: personal/samba/class_sambaAccount.inc:685
+#: personal/samba/class_sambaAccount.inc:693
 #, fuzzy
 msgid "on"
 msgstr "关闭"
 
-#: personal/samba/class_sambaAccount.inc:768
-#: personal/samba/class_sambaAccount.inc:776
-#: personal/samba/class_sambaAccount.inc:784
-#: personal/samba/class_sambaAccount.inc:792
-#: personal/samba/class_sambaAccount.inc:800
-#: personal/samba/class_sambaAccount.inc:808
-#: personal/samba/class_sambaAccount.inc:814
-#: personal/samba/class_sambaAccount.inc:820
+#: personal/samba/class_sambaAccount.inc:701
+#: personal/samba/class_sambaAccount.inc:709
+#: personal/samba/class_sambaAccount.inc:717
+#: personal/samba/class_sambaAccount.inc:725
+#: personal/samba/class_sambaAccount.inc:733
+#: personal/samba/class_sambaAccount.inc:741
+#: personal/samba/class_sambaAccount.inc:747
+#: personal/samba/class_sambaAccount.inc:753
 #, fuzzy
 msgid "unset"
 msgstr "六月"
 
-#: personal/samba/class_sambaAccount.inc:822
+#: personal/samba/class_sambaAccount.inc:755
 msgid "immediately"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:828
+#: personal/samba/class_sambaAccount.inc:761
 #, fuzzy
 msgid "days"
 msgstr "星期日"
 
-#: personal/samba/class_sambaAccount.inc:829
+#: personal/samba/class_sambaAccount.inc:762
 #, fuzzy
 msgid "hours"
 msgstr "小时"
 
-#: personal/samba/class_sambaAccount.inc:836
+#: personal/samba/class_sambaAccount.inc:769
 #, fuzzy
 msgid "Domain attributes"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:837
-#: personal/samba/class_sambaAccount.inc:838
+#: personal/samba/class_sambaAccount.inc:770
+#: personal/samba/class_sambaAccount.inc:771
 #, fuzzy
 msgid "Min password length"
 msgstr "口令存储"
 
-#: personal/samba/class_sambaAccount.inc:839
+#: personal/samba/class_sambaAccount.inc:772
 #, fuzzy
 msgid "Password history"
 msgstr "口令存储"
 
-#: personal/samba/class_sambaAccount.inc:840
+#: personal/samba/class_sambaAccount.inc:773
 #, fuzzy
 msgid "Force password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:841
+#: personal/samba/class_sambaAccount.inc:774
 #, fuzzy
 msgid "Maximum password age"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:842
+#: personal/samba/class_sambaAccount.inc:775
 #, fuzzy
 msgid "Minimum password age"
 msgstr "管理员口令"
 
-#: personal/samba/class_sambaAccount.inc:843
+#: personal/samba/class_sambaAccount.inc:776
 #, fuzzy
 msgid "Lockout duration"
 msgstr "位置"
 
-#: personal/samba/class_sambaAccount.inc:844
+#: personal/samba/class_sambaAccount.inc:777
 msgid "Bad lockout attempt"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:845
+#: personal/samba/class_sambaAccount.inc:778
 #, fuzzy
 msgid "Disconnect time"
 msgstr "断开"
 
-#: personal/samba/class_sambaAccount.inc:846
+#: personal/samba/class_sambaAccount.inc:779
 #, fuzzy
 msgid "Refuse machine password change"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:848
+#: personal/samba/class_sambaAccount.inc:781
 #, fuzzy
 msgid "User attributes"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:849
+#: personal/samba/class_sambaAccount.inc:782
 #, fuzzy
 msgid "SID"
 msgstr "GID"
 
-#: personal/samba/class_sambaAccount.inc:850
+#: personal/samba/class_sambaAccount.inc:783
 #, fuzzy
 msgid "Last failed login"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:851
+#: personal/samba/class_sambaAccount.inc:784
 #, fuzzy
 msgid "Logon attempts"
 msgstr "电话属性"
 
-#: personal/samba/class_sambaAccount.inc:852
+#: personal/samba/class_sambaAccount.inc:785
 #, fuzzy
 msgid "Last password update"
 msgstr "新口令"
 
-#: personal/samba/class_sambaAccount.inc:853
+#: personal/samba/class_sambaAccount.inc:786
 #, fuzzy
 msgid "Last logon"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:854
+#: personal/samba/class_sambaAccount.inc:787
 #, fuzzy
 msgid "Last logoff"
 msgstr "姓"
 
-#: personal/samba/class_sambaAccount.inc:855
+#: personal/samba/class_sambaAccount.inc:788
 #, fuzzy
 msgid "Automatic logoff"
 msgstr "自动"
 
-#: personal/samba/class_sambaAccount.inc:858
-#: personal/samba/class_sambaAccount.inc:863
-#: personal/samba/class_sambaAccount.inc:1384
+#: personal/samba/class_sambaAccount.inc:791
+#: personal/samba/class_sambaAccount.inc:796
 #, fuzzy
 msgid "Password expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/class_sambaAccount.inc:858
+#: personal/samba/class_sambaAccount.inc:791
 msgid "No"
 msgstr "否"
 
-#: personal/samba/class_sambaAccount.inc:860
+#: personal/samba/class_sambaAccount.inc:793
 #, fuzzy, php-format
 msgid "The password would expire on %s, but the password expiry is disabled."
 msgstr "输入的“新口令”为空。"
 
-#: personal/samba/class_sambaAccount.inc:866
+#: personal/samba/class_sambaAccount.inc:799
 #, fuzzy
 msgid "Password change available"
 msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:924
+#: personal/samba/class_sambaAccount.inc:857
 #, fuzzy
 msgid "Home drive"
 msgstr "用户主目录"
 
-#: personal/samba/class_sambaAccount.inc:927
+#: personal/samba/class_sambaAccount.inc:860
 #, fuzzy
 msgid "Home path"
 msgstr "住宅电话"
 
-#: personal/samba/class_sambaAccount.inc:950
-msgid "Account expires after"
-msgstr "账号过期于"
-
-#: personal/samba/class_sambaAccount.inc:953
-msgid "Password expires on"
-msgstr "口令过期截止日"
-
-#: personal/samba/class_sambaAccount.inc:958
+#: personal/samba/class_sambaAccount.inc:883
 #, fuzzy
 msgid "The windows usermanager allows eight clients at maximum!"
 msgstr "Windows 用户管理员只允许八个客户。您指定的超过八个。"
 
-#: personal/samba/class_sambaAccount.inc:979
+#: personal/samba/class_sambaAccount.inc:902
 msgid "Information"
 msgstr "提示信息"
 
-#: personal/samba/class_sambaAccount.inc:1167
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1030
+#: personal/samba/class_sambaAccount.inc:1054
 msgid "Warning"
 msgstr "警告"
 
-#: personal/samba/class_sambaAccount.inc:1167
+#: personal/samba/class_sambaAccount.inc:1030
 msgid "Undefined Samba SID detected. Please fix this problem manually!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1191
+#: personal/samba/class_sambaAccount.inc:1055
 msgid ""
 "Cannot convert primary group to samba group: group cannot be identified!"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1363 personal/samba/main.inc:136
+#: personal/samba/class_sambaAccount.inc:1154 personal/samba/main.inc:136
 msgid "Samba settings"
 msgstr "Samba 设置"
 
-#: personal/samba/class_sambaAccount.inc:1367
+#: personal/samba/class_sambaAccount.inc:1158
 msgid "My account"
 msgstr "我的账号"
 
-#: personal/samba/class_sambaAccount.inc:1373
+#: personal/samba/class_sambaAccount.inc:1164
 #, fuzzy
 msgid "Generic home directory"
 msgstr "用户主目录"
 
-#: personal/samba/class_sambaAccount.inc:1374
+#: personal/samba/class_sambaAccount.inc:1165
 msgid "Generic samba home drive"
 msgstr ""
 
-#: personal/samba/class_sambaAccount.inc:1376
+#: personal/samba/class_sambaAccount.inc:1167
 #, fuzzy
 msgid "Generic script path"
 msgstr "脚本路径"
 
-#: personal/samba/class_sambaAccount.inc:1377
+#: personal/samba/class_sambaAccount.inc:1168
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Profile path"
 
-#: personal/samba/class_sambaAccount.inc:1380
+#: personal/samba/class_sambaAccount.inc:1173
 #, fuzzy
-msgid "Allow user to change password"
-msgstr "允许用户从客户端修改口令"
+msgid "Disallow password change"
+msgstr "不允许修改口令"
 
-#: personal/samba/class_sambaAccount.inc:1382
+#: personal/samba/class_sambaAccount.inc:1175
 #, fuzzy
 msgid "Password never expires"
 msgstr "口令过期截止日"
 
-#: personal/samba/class_sambaAccount.inc:1387
+#: personal/samba/class_sambaAccount.inc:1178
 #, fuzzy
 msgid "Logon hours"
 msgstr "1 小时"
 
-#: personal/samba/class_sambaAccount.inc:1388
+#: personal/samba/class_sambaAccount.inc:1179
 #, fuzzy
 msgid "Allow connection from"
 msgstr "只允许从这些工作站建立连接"
 
-#: personal/samba/class_sambaAccount.inc:1443
+#: personal/samba/class_sambaAccount.inc:1236
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -601,6 +588,16 @@ msgstr "选择一个部门来做查询"
 msgid "Regular expression for matching addresses"
 msgstr "匹配地址的正则表达式"
 
+#~ msgid "Account expires after"
+#~ msgstr "账号过期于"
+
+#~ msgid "Password expires on"
+#~ msgstr "口令过期截止日"
+
+#, fuzzy
+#~ msgid "Allow user to change password"
+#~ msgstr "允许用户从客户端修改口令"
+
 #~ msgid "Choose subtree to place group in"
 #~ msgstr "选择来放置组的子树"
 
diff --git a/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po
index b87d6ab9d..6d4ec4c5f 100644
--- a/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-04 09:28+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team:  <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po
index 94fbf1cd9..7adf255c8 100644
--- a/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 01:05+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po
index 1bf972e9a..8cb9cb54b 100644
--- a/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-07-24 01:33+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po
index 96e56eddd..3b92717a9 100644
--- a/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/messages.po b/gosa-plugins/scalix/locale/messages.po
index b16212e7f..c6f3cabfd 100644
--- a/gosa-plugins/scalix/locale/messages.po
+++ b/gosa-plugins/scalix/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po
index 2865fbf29..afd80405e 100644
--- a/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po
index cccfba53d..68c4457f9 100644
--- a/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po
index 32f5a9aeb..d1d1974d0 100644
--- a/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po
index c2207f910..4ab314da9 100644
--- a/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/scalix/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po
index f85c5ecae..20414cdc5 100644
--- a/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/de/LC_MESSAGES/messages.po
@@ -12,10 +12,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-04-03 15:59+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po
index 375b84a29..c9ec2f286 100644
--- a/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2010-01-20 00:41+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po
index 3c054db59..c48d9d550 100644
--- a/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2008-06-08 15:51+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po
index d2beb0c24..580180f69 100644
--- a/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/messages.po b/gosa-plugins/squid/locale/messages.po
index 2c3b2bb9c..753e983f4 100644
--- a/gosa-plugins/squid/locale/messages.po
+++ b/gosa-plugins/squid/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po
index 100191566..389a5bd23 100644
--- a/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po
index f993e7d22..e02783d60 100644
--- a/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po
index d01d17380..aa23803a5 100644
--- a/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po
index 47e19ecd3..2d140e90e 100644
--- a/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/squid/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:38+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po
index 019e2c002..4f2e200dc 100644
--- a/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ssh/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2009-08-26 15:37+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po
index cc9167cf4..50d5432d7 100644
--- a/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/ssh/locale/fr/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2009-09-01 09:42+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/ssh/locale/messages.po b/gosa-plugins/ssh/locale/messages.po
index 6434ee0f8..f3af733c3 100644
--- a/gosa-plugins/ssh/locale/messages.po
+++ b/gosa-plugins/ssh/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po
index 7580fcc90..271e22a70 100644
--- a/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/de/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2008-12-03 15:08+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,15 +21,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Filter"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Name"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "Benutzer"
 
@@ -50,60 +51,60 @@ msgstr ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
 "'Abbrechen' zum Abbruch."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "Vollzugriff"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Gruppe"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr "Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 msgid "Sudo role"
 msgstr "Sudo-Rolle"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Benutzer"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 msgid "Host"
 msgstr "System"
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 msgid "Command"
 msgstr "Kommando"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 msgid "Run as user"
 msgstr "Als Benutzer ausführen"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 msgid "Access control list"
 msgstr "Zugriffsberechtigungen"
 
@@ -225,4 +226,3 @@ msgstr "Sudo-Optionen"
 #: admin/sudo/class_sudoManagement.inc:26
 msgid "Sudo management"
 msgstr "SUDO-Verwaltung"
-
diff --git a/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po
index afa7092b4..4fadb0f08 100644
--- a/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2010-01-28 23:56+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,15 +23,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Filtro"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Nombre"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "Usuario"
 
@@ -52,60 +53,60 @@ msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr "Error"
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "desactivado"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Grupo"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr "Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 msgid "Sudo role"
 msgstr "Rol Sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Usuarios"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 msgid "Host"
 msgstr "Nombre de equipo"
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 msgid "Command"
 msgstr "Comando"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 msgid "Run as user"
 msgstr "Ejecutar como usuario"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 msgid "Access control list"
 msgstr "Lista de control de acceso"
 
diff --git a/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po
index 0b85e79b1..9579618c4 100644
--- a/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/fr/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2010-01-18 23:20+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,15 +21,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Filtre"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Nom"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "Utilisateur"
 
@@ -51,60 +52,60 @@ msgstr ""
 "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
 "'Annuler' pour abandonner."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "désactivé"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "accès complet"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Groupes"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 msgid "Sudo role"
 msgstr "Rôle sudo"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 msgid "Host"
 msgstr "Hôte"
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 msgid "Command"
 msgstr "Commande"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 msgid "Run as user"
 msgstr "Exécuter comme un utilisateur"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 msgid "Access control list"
 msgstr "Contrôle d'accès (ACL)"
 
diff --git a/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po
index 2ce9babc2..03dda1aa8 100644
--- a/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,15 +21,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Filtri"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Cognome"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr ""
 
@@ -49,65 +50,65 @@ msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "disabilitato"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "accesso completo"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "accesso limitato ai seguenti host"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Gruppo"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Cognome"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 #, fuzzy
 msgid "Sudo role"
 msgstr "Cognome"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Utenti"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 msgid "Host"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 #, fuzzy
 msgid "Command"
 msgstr "e"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 #, fuzzy
 msgid "Run as user"
 msgstr "Utenti di Dominio"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 #, fuzzy
 msgid "Access control list"
 msgstr "Opzioni di accesso"
diff --git a/gosa-plugins/sudo/locale/messages.po b/gosa-plugins/sudo/locale/messages.po
index e45862219..6ca110cba 100644
--- a/gosa-plugins/sudo/locale/messages.po
+++ b/gosa-plugins/sudo/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,15 +21,15 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr ""
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr ""
 
@@ -46,60 +47,60 @@ msgstr ""
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 msgid "LDAP error"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 msgid "Sudo"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 msgid "Sudo role"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 msgid "Host"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 msgid "Command"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 msgid "Run as user"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 msgid "Access control list"
 msgstr ""
 
diff --git a/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po
index cd8e5fa72..679666303 100644
--- a/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,15 +25,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Filters"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Naam"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "Gebruiker"
 
@@ -54,66 +55,66 @@ msgstr ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
 "om te annuleren."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr "Fout"
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "gedeactiveerd"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "volledige toegang"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Groep"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Achternaam"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 #, fuzzy
 msgid "Sudo role"
 msgstr "! onbekend id"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Gebruikers"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 #, fuzzy
 msgid "Host"
 msgstr "Inhakers"
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 #, fuzzy
 msgid "Command"
 msgstr "en"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 #, fuzzy
 msgid "Run as user"
 msgstr "Windows gebruikers"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 #, fuzzy
 msgid "Access control list"
 msgstr "Toegangsopties"
diff --git a/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po
index 92d234756..98f703c85 100644
--- a/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Filtry"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Imię"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "Użytkownik"
 
@@ -47,66 +48,66 @@ msgstr ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
 "anulować."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "wyłączone"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "pełen dostęp"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Grupa"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Nazwisko"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 #, fuzzy
 msgid "Sudo role"
 msgstr "! nieznane id"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Opis"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 #, fuzzy
 msgid "Host"
 msgstr "Zaczepy"
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 #, fuzzy
 msgid "Command"
 msgstr "i"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 #, fuzzy
 msgid "Run as user"
 msgstr "Użytkownicy domeny"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 #, fuzzy
 msgid "Access control list"
 msgstr "Kontrola dostępu"
diff --git a/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po
index ec71416bc..466403131 100644
--- a/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,15 +20,15 @@ msgstr ""
 msgid "Filter"
 msgstr "Фильтры"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "Фамилия"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "Пользователь"
 
@@ -50,65 +51,65 @@ msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "отключен"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "полный доступ"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "Группа"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "Имя сервера"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 #, fuzzy
 msgid "Sudo role"
 msgstr "состояние неизвестно"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "Описание"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "Пользователи"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 msgid "Host"
 msgstr ""
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 #, fuzzy
 msgid "Command"
 msgstr "и"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 #, fuzzy
 msgid "Run as user"
 msgstr "Пользователи домена"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 #, fuzzy
 msgid "Access control list"
 msgstr "Параметры доступа"
diff --git a/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po
index 662f2ee11..1832a50ed 100644
--- a/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/sudo/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,15 +22,15 @@ msgstr ""
 msgid "Filter"
 msgstr "过滤器"
 
-#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:580
-#: admin/sudo/class_sudoGeneric.inc:585 admin/sudo/class_sudoGeneric.inc:590
-#: admin/sudo/class_sudoGeneric.inc:599 admin/sudo/class_sudoGeneric.inc:638
+#: admin/sudo/sudo-filter.tpl:13 admin/sudo/class_sudoGeneric.inc:582
+#: admin/sudo/class_sudoGeneric.inc:587 admin/sudo/class_sudoGeneric.inc:592
+#: admin/sudo/class_sudoGeneric.inc:601 admin/sudo/class_sudoGeneric.inc:640
 #: admin/sudo/generic.tpl:7 admin/sudo/generic.tpl:34
 #: admin/sudo/sudo-list.xml:32 admin/sudo/paste_generic.tpl:5
 msgid "Name"
 msgstr "名称"
 
-#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:421
+#: admin/sudo/sudo-filter.tpl:23 admin/sudo/class_sudoGeneric.inc:423
 msgid "User"
 msgstr "用户"
 
@@ -47,66 +48,66 @@ msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr "所以，如果您确定，请按“删除”继续，否则按“取消”退出。"
 
-#: admin/sudo/class_sudoGeneric.inc:332
+#: admin/sudo/class_sudoGeneric.inc:334
 msgid "Error"
 msgstr "错误"
 
-#: admin/sudo/class_sudoGeneric.inc:374
+#: admin/sudo/class_sudoGeneric.inc:376
 msgid "disabled"
 msgstr "禁用"
 
-#: admin/sudo/class_sudoGeneric.inc:375
+#: admin/sudo/class_sudoGeneric.inc:377
 msgid "full access"
 msgstr "完全访问权限"
 
-#: admin/sudo/class_sudoGeneric.inc:376
+#: admin/sudo/class_sudoGeneric.inc:378
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: admin/sudo/class_sudoGeneric.inc:422
+#: admin/sudo/class_sudoGeneric.inc:424
 msgid "Group"
 msgstr "组"
 
-#: admin/sudo/class_sudoGeneric.inc:566
+#: admin/sudo/class_sudoGeneric.inc:568
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/sudo/class_sudoGeneric.inc:629 admin/sudo/class_sudoManagement.inc:25
+#: admin/sudo/class_sudoGeneric.inc:631 admin/sudo/class_sudoManagement.inc:25
 #, fuzzy
 msgid "Sudo"
 msgstr "姓"
 
-#: admin/sudo/class_sudoGeneric.inc:630 admin/sudo/class_sudoGeneric.inc:635
+#: admin/sudo/class_sudoGeneric.inc:632 admin/sudo/class_sudoGeneric.inc:637
 #, fuzzy
 msgid "Sudo role"
 msgstr "! 未知 id"
 
-#: admin/sudo/class_sudoGeneric.inc:639 admin/sudo/generic.tpl:15
+#: admin/sudo/class_sudoGeneric.inc:641 admin/sudo/generic.tpl:15
 #: admin/sudo/generic.tpl:44 admin/sudo/sudo-list.xml:40
 msgid "Description"
 msgstr "描述"
 
-#: admin/sudo/class_sudoGeneric.inc:640
+#: admin/sudo/class_sudoGeneric.inc:642
 msgid "Users"
 msgstr "用户"
 
-#: admin/sudo/class_sudoGeneric.inc:641
+#: admin/sudo/class_sudoGeneric.inc:643
 #, fuzzy
 msgid "Host"
 msgstr "钩子"
 
-#: admin/sudo/class_sudoGeneric.inc:642
+#: admin/sudo/class_sudoGeneric.inc:644
 #, fuzzy
 msgid "Command"
 msgstr "和"
 
-#: admin/sudo/class_sudoGeneric.inc:643
+#: admin/sudo/class_sudoGeneric.inc:645
 #, fuzzy
 msgid "Run as user"
 msgstr "域用户"
 
-#: admin/sudo/class_sudoGeneric.inc:644
+#: admin/sudo/class_sudoGeneric.inc:646
 #, fuzzy
 msgid "Access control list"
 msgstr "访问选项"
diff --git a/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po
index bace754ba..53577a2a1 100644
--- a/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2008-12-19 08:43+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,62 +48,32 @@ msgstr ""
 msgid "Systems"
 msgstr "Systeme"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "You have no permission to change this password!"
 msgstr "Sie haben keine Berechtigung, um das Passwort zu ändern!"
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr "Fehler"
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
@@ -110,115 +81,91 @@ msgstr ""
 "Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
 "Passworts' eingegeben haben sind nicht identisch!"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method"
 msgstr "Passwort-Methode"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 "Die Password-Methode CRYPT fehlt. Kann das System-Passwort nicht setzen."
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Zurück"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 "Erstellen des Abbilds fehlgeschlagen. Bitte überprüfen Sie den Fehlerbericht "
 "unterhalb."
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 "Das Kommando '%s', angegeben für die ISO-Erstellung, scheint nicht zu "
 "existieren."
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 msgid "Service infrastructure"
 msgstr "Dienst-Infrastruktur"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Cannot set mode to 'active'!"
 msgstr "Kann Modus nicht auf 'aktiv' setzen!"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+msgid "Inherited from %s"
+msgstr "Geerbt von %s"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 msgid "Incoming objects"
 msgstr "Eingehende Objekte"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 msgid "Incoming"
 msgstr "Eingehend"
 
@@ -271,21 +218,21 @@ msgstr "!"
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Beschreibung"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "Aktionen"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Anlegen"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -315,29 +262,29 @@ msgstr "Dienst bearbeiten"
 msgid "Remove service"
 msgstr "Dienst entfernen"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "Filter error"
 msgstr "Filter Fehler"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr "Der Filter ist unvollständig!"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Information"
 msgstr "Information"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr "Kann den Dienst-Status nicht setzen bis der Server gespeichert wurde."
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 msgid "Cannot update service status!"
 msgstr "Kann Dienst-Status nicht aktualisieren!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Server-Name"
 
@@ -354,15 +301,15 @@ msgid "Printer name"
 msgstr "Druckername"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 msgid "Component name"
 msgstr "Komponenten-Name"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Basis"
@@ -372,30 +319,26 @@ msgid "Please select the desired entries"
 msgstr "Bitte wählen Sie die gewünschten Einträge"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Server"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr "Terminal"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Name"
 
@@ -443,142 +386,6 @@ msgstr "Zeige neue Geräte"
 msgid "Show OPSI based clients"
 msgstr "Zeige OPSI Clients"
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-"Bearbeiten von Objekten dieses Typs wird momentan noch nicht unterstützt!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr ""
-"Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
-"Passworts' eingegeben haben sind nicht identisch!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-msgid "Cannot determine object to change password!"
-msgstr "Kann Objekt nicht erkennen, um das Passwort zu ändern."
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "Neues Terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "Neue Arbeitsstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-msgid "Unknown device"
-msgstr "Unbekanntes Gerät"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr "Neues Gerät"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr "Terminal-Vorlage für"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "Arbeitsstations-Vorlage für"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "Vorlage"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-msgid "Network device"
-msgstr "Netzwerk-Gerät"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Drucker"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-msgid "Windows workstation"
-msgstr "Windows-Arbeitsstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-msgid "Locked workstation"
-msgstr "Gesperrte Arbeitsstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-msgid "Locked server"
-msgstr "Gesperrter Server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-msgid "Locked terminal"
-msgstr "Gesperrtes Terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-msgid "Workstation error"
-msgstr "Arbeitsstationsfehler"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-msgid "Server error"
-msgstr "Serverfehler"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-msgid "Terminal error"
-msgstr "Terminalfehler"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-msgid "Workstation busy"
-msgstr "Arbeitsstation beschäftigt"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-msgid "Server busy"
-msgstr "Server ist ausgelastet"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-msgid "New system from incoming"
-msgstr "Neues Gerät aus 'incoming'"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-msgid "Opsi client"
-msgstr "OPSI Client"
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Netzwerk-Einstellungen"
@@ -603,7 +410,7 @@ msgstr "Automatisch feststellen"
 msgid "Enable DHCP for this device"
 msgstr "DHCP für dieses Gerät aktivieren"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 msgid "not configured"
 msgstr "unkonfiguriert"
 
@@ -615,19 +422,19 @@ msgstr "Parent-Node"
 msgid "Edit settings"
 msgstr "Einstellungen bearbeiten"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr "DNS für dieses Gerät aktivieren"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr "DNS-Einträge"
 
@@ -639,11 +446,31 @@ msgstr "Liste der Systeme"
 msgid "Opsi host"
 msgstr "OPSI Client"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "Neue Arbeitsstation"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked server"
+msgstr "Gesperrter Server"
+
+#: admin/systems/system-list.xml:38
+msgid "Locked workstation"
+msgstr "Gesperrte Arbeitsstation"
+
+#: admin/systems/system-list.xml:46
+msgid "Locked terminal"
+msgstr "Gesperrtes Terminal"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "Neues Terminal"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 msgid "New unknown device"
 msgstr "Unbekanntes neues Gerät"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 msgid "New device"
 msgstr "Neues Gerät"
 
@@ -659,74 +486,95 @@ msgstr "Terminal-Vorlage"
 msgid "Winstation"
 msgstr "Windows-Arbeitsstation"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Drucker"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Telefon"
+
 #: admin/systems/system-list.xml:143
 msgid "Component"
 msgstr "Komponente"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+msgid "Release"
+msgstr "Release"
+
+#: admin/systems/system-list.xml:234
 msgid "Network printer"
 msgstr "Netzwerk-Drucker"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+msgid "Network device"
+msgstr "Netzwerk-Gerät"
+
+#: admin/systems/system-list.xml:258
+msgid "Opsi client"
+msgstr "OPSI Client"
+
+#: admin/systems/system-list.xml:270
 msgid "Trigger action"
 msgstr "Aktion auslösen"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr "Anhalten"
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "Neustarten"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 msgid "Wakeup"
 msgstr "Aufwecken"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 msgid "Lock"
 msgstr "Sperren"
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 msgid "Activate"
 msgstr "Aktivieren"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr "Neu-Installation"
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 msgid "Schedule action"
 msgstr "Aktion planen"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr "Anhalten"
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 msgid "Activate systems"
 msgstr "Aktiviere Systeme"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 msgid "Create ISO"
 msgstr "DVD-ISO anlegen"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 msgid "Edit role"
 msgstr "Rolle bearbeiten"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 msgid "Remove system"
 msgstr "System entfernen"
 
@@ -767,164 +615,156 @@ msgstr "Passwort-Stärke"
 msgid "Set password"
 msgstr "Passwort setzen"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr "Aktiv"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 msgid "Event error"
 msgstr "Ereignisfehler"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "Das Ereignis '%s' ist nicht verfügbar!"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "Ausschalten"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 msgid "System update"
 msgstr "Systemaktualisierung"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr "Hardware neu erkennen"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr "Speichertest"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr "Erzwinge lokalen Systemstart"
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr "Systemanalyse"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "Aufwecken"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 msgid "Software deployment"
 msgstr "Softwareverteilung"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 "Der Host ist gerade mitten in der Installation - wenn Sie dennoch speichern "
 "möchten, drücken Sie auf 'OK'."
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Allgemein"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 msgid "Server generic"
 msgstr "Server (Allgemein)"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 msgid "Goto mode"
 msgstr "GOto-Modus"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 msgid "Root password"
 msgstr "Root-Passwort"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 msgid "Action flag"
 msgstr "Ablaufstatus"
 
-#: admin/systems/server.tpl:26
-msgid "Choose subtree to place server in"
-msgstr "Wählen Sie den Teilbaum, in den der Server eingepflegt werden soll"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr "Wählen Sie eine Basis"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "Wählen Sie den Terminal-Modus"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Aktion"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 "Eine Systeminstallation läuft gerade, der FAI state kann momentan nicht "
 "geändert werden."
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Ausführen"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 msgid "Not matching"
 msgstr "Nicht zutreffend"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, php-format
 msgid "IP address %s"
 msgstr "IP-Adresse %s"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 msgid "IP address"
 msgstr "IP-Adresse"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr "MAC-Adresse"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "Die IP-Adresse '%s' passt nicht in die gewählte Reverse-Zone '%s'!"
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "Datensatz-Typ '%s' ist doppelt vorhanden!"
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "Eindeutiger Datensatz-Typ '%s' ist doppelt vorhanden!"
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
@@ -933,41 +773,41 @@ msgstr ""
 "Die IP-Adresse '%s' wird automatisch als 'A'-Datensatz eingefügt. Bitte "
 "entfernen Sie den Eintrag."
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 "Es sind nur Kleinbuchstaben in Datensätzen erlaubt, bitte prüfen Sie '%ss'."
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Entfernen"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 msgid "DNS settings"
 msgstr "DNS-Einstellungen"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 msgid "DNS configuration"
 msgstr "DNS-Konfiguration"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 msgid "DHCP configuration"
 msgstr "DHCP-Konfiguration"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 msgid "component"
 msgstr "Komponente"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 msgid "Component generic"
 msgstr "Netzwerk-Komponente (Allgemein)"
 
@@ -975,6 +815,62 @@ msgstr "Netzwerk-Komponente (Allgemein)"
 msgid "Device name"
 msgstr "Gerätename"
 
-#: admin/systems/component.tpl:20
-msgid "Choose subtree to place component in"
-msgstr "Wählen Sie den Teilbaum, in den die Komponente eingepflegt werden soll"
+#~ msgid "Editing this type of object is not supported yet!"
+#~ msgstr ""
+#~ "Bearbeiten von Objekten dieses Typs wird momentan noch nicht unterstützt!"
+
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr ""
+#~ "Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
+#~ "Passworts' eingegeben haben sind nicht identisch!"
+
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "Kann Objekt nicht erkennen, um das Passwort zu ändern."
+
+#~ msgid "Unknown device"
+#~ msgstr "Unbekanntes Gerät"
+
+#~ msgid "New Device"
+#~ msgstr "Neues Gerät"
+
+#~ msgid "Terminal template for"
+#~ msgstr "Terminal-Vorlage für"
+
+#~ msgid "Workstation template for"
+#~ msgstr "Arbeitsstations-Vorlage für"
+
+#~ msgid "Template"
+#~ msgstr "Vorlage"
+
+#~ msgid "Windows workstation"
+#~ msgstr "Windows-Arbeitsstation"
+
+#~ msgid "Workstation error"
+#~ msgstr "Arbeitsstationsfehler"
+
+#~ msgid "Server error"
+#~ msgstr "Serverfehler"
+
+#~ msgid "Terminal error"
+#~ msgstr "Terminalfehler"
+
+#~ msgid "Workstation busy"
+#~ msgstr "Arbeitsstation beschäftigt"
+
+#~ msgid "Server busy"
+#~ msgstr "Server ist ausgelastet"
+
+#~ msgid "New system from incoming"
+#~ msgstr "Neues Gerät aus 'incoming'"
+
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Wählen Sie den Teilbaum, in den der Server eingepflegt werden soll"
+
+#~ msgid "Select a base"
+#~ msgstr "Wählen Sie eine Basis"
+
+#~ msgid "Choose subtree to place component in"
+#~ msgstr ""
+#~ "Wählen Sie den Teilbaum, in den die Komponente eingepflegt werden soll"
diff --git a/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po
index 7824623f0..1dab73212 100644
--- a/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/es/LC_MESSAGES/messages.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2010-01-29 00:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,180 +46,126 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "Permission error"
 msgstr "Error de permisos"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "You have no permission to change this password!"
 msgstr "¡No tiene permisos para cambiar esta contraseña!"
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr "Error"
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
 msgstr ""
 "¡La contraseñas introducidas como 'Nueva contraseña' y 'Reintroduzca "
-"contraseña' no "
-"coinciden!"
+"contraseña' no coinciden!"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method"
 msgstr "Método de contraseña"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 "No se encuentra método de codificación de contraseña. No se pueden "
 "introducir contraseñas de sistema."
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Atrás"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 "Ha fallado la creación de la imagen. Por favor compruebe el problema en el "
 "siguiente informe."
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 "No parece existir el comando '%s', especificado para la creación de imágenes "
 "ISO."
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 msgid "Service infrastructure"
 msgstr "Infraestructura de servicio"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 msgid "Permission"
 msgstr "Permisos"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Internal error"
 msgstr "error interno"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Cannot set mode to 'active'!"
 msgstr "¡No se puede poner el modo a 'activo'!"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "No tiene permisos para crear una instantanea para %s."
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "No tiene permisos para recuperar una instantanea para %s."
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, php-format
+msgid "Inherited from %s"
+msgstr "Heredado de %s"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 msgid "Incoming objects"
 msgstr "Objetos de entrada"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 msgid "Incoming"
 msgstr "Entrada"
 
@@ -271,21 +218,21 @@ msgstr "!"
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Descripción"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "Acciones"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Crear"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -315,30 +262,30 @@ msgstr "Editar servicio"
 msgid "Remove service"
 msgstr "Eliminar servicio"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "Filter error"
 msgstr "Error del filtro"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr "¡El filtro está incompleto!"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Information"
 msgstr "Información"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr ""
 "¡No puedo actualizar el estado del servicio hasta que no se haya grabado!"
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 msgid "Cannot update service status!"
 msgstr "¡No se puede actualizar el estado del servicio!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nombre del servidor"
 
@@ -355,15 +302,15 @@ msgid "Printer name"
 msgstr "Nombre de la impresora"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 msgid "Component name"
 msgstr "Nombre del componente"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Base"
@@ -373,30 +320,26 @@ msgid "Please select the desired entries"
 msgstr "Por favor seleccione las entradas que desee"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Servidor"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr "Terminal"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Nombre"
 
@@ -444,141 +387,6 @@ msgstr "Mostrar dispositivos entrantes"
 msgid "Show OPSI based clients"
 msgstr "Mostrar clientes basados OPSI"
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr "¡No está soportado editar este tipo de objeto todavía!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr ""
-"¡La contraseñas introducidas como nueva y reintroduzca contraseña no "
-"coinciden!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-msgid "Cannot determine object to change password!"
-msgstr "¡No puedo encontrar el objeto para cambiarle la contraseña!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "Nuevo terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "Nueva estación de trabajo"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-msgid "Unknown device"
-msgstr "Dispositivo desconocido"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr "Nuevo Dispositivo"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr "Plantilla de terminal para"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "Plantilla de estación de trabajo para"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "Plantilla"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Teléfono"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-msgid "Network device"
-msgstr "Dispositivo de Red"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Impresora"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-msgid "Windows workstation"
-msgstr "Estaciones de trabajo Windows"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-msgid "Locked workstation"
-msgstr "Estación de trabajo bloqueada"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-msgid "Locked server"
-msgstr "Servidor bloqueado"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-msgid "Locked terminal"
-msgstr "Terminal bloqueado"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-msgid "Workstation error"
-msgstr "Error en estación de trabajo"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-msgid "Server error"
-msgstr "Error en servidor"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-msgid "Terminal error"
-msgstr "Error en terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-msgid "Workstation busy"
-msgstr "Estación de trabajo ocupada"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-msgid "Server busy"
-msgstr "Servidor ocupado"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-msgid "New system from incoming"
-msgstr "Nuevo sistema desde entrada"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-msgid "Opsi client"
-msgstr "cliente Opsi"
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Red\tparámetros"
@@ -603,7 +411,7 @@ msgstr "Autodetección"
 msgid "Enable DHCP for this device"
 msgstr "Activar DHCP para este dispositivo"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 msgid "not configured"
 msgstr "Sin configurar"
 
@@ -615,19 +423,19 @@ msgstr "Servidor Origen"
 msgid "Edit settings"
 msgstr "Editar características"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr "Activar DNS para este dispositivo"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr "Zona"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr "Registros DNS"
 
@@ -639,11 +447,31 @@ msgstr "Lista de sistemas"
 msgid "Opsi host"
 msgstr "Equipo Opsi"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "Nueva estación de trabajo"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked server"
+msgstr "Servidor bloqueado"
+
+#: admin/systems/system-list.xml:38
+msgid "Locked workstation"
+msgstr "Estación de trabajo bloqueada"
+
+#: admin/systems/system-list.xml:46
+msgid "Locked terminal"
+msgstr "Terminal bloqueado"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "Nuevo terminal"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 msgid "New unknown device"
 msgstr "Nuevo dispositivo desconocido"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 msgid "New device"
 msgstr "Nuevo dispositivo"
 
@@ -659,74 +487,95 @@ msgstr "Plantilla de terminal"
 msgid "Winstation"
 msgstr "Estación de trabajo Windows"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Impresora"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Teléfono"
+
 #: admin/systems/system-list.xml:143
 msgid "Component"
 msgstr "componente"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+msgid "Release"
+msgstr "Versión"
+
+#: admin/systems/system-list.xml:234
 msgid "Network printer"
 msgstr "Impresora de Red"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+msgid "Network device"
+msgstr "Dispositivo de Red"
+
+#: admin/systems/system-list.xml:258
+msgid "Opsi client"
+msgstr "cliente Opsi"
+
+#: admin/systems/system-list.xml:270
 msgid "Trigger action"
 msgstr "Acción disparada"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr "Para sistema "
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 msgid "Wakeup"
 msgstr "Despertar"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr "Actualizar"
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 msgid "Lock"
 msgstr "Bloqueo"
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 msgid "Activate"
 msgstr "Activar"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 msgid "Schedule action"
 msgstr "Acción programada"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr "Parar sistema"
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 msgid "Activate systems"
 msgstr "Activar sistemas"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 msgid "Create ISO"
 msgstr "Crear ISO"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 msgid "Edit role"
 msgstr "Editar rol"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 msgid "Remove system"
 msgstr "Eliminar sistema"
 
@@ -766,165 +615,157 @@ msgstr "Resistencia de la contraseña"
 msgid "Set password"
 msgstr "Introducir contraseña"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr "Activado"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 msgid "server"
 msgstr "Servidor"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 msgid "Event error"
 msgstr "Evento de error"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "¡El evento '%s' no está disponible!"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "Apagar"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 msgid "System update"
 msgstr "Actualización del sistema"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr "Buscar hardware"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr "Chequeo de memoria"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr "Forzar inicio local"
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr "Análisis del sistema"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "Despertar"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 msgid "Software deployment"
 msgstr "Desarrollo de software"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 "Esta maquina está actualmente instalando, si quiere realmente grabarla, "
 "pulse 'OK'."
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Genérico"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 msgid "Server generic"
 msgstr "Servidor genérico"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 msgid "Goto mode"
 msgstr "Pasar al modo"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 msgid "Root password"
 msgstr "Contraseña de root"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 msgid "Action flag"
 msgstr "Marca de acción"
 
-#: admin/systems/server.tpl:26
-msgid "Choose subtree to place server in"
-msgstr "Elija el subárbol donde colocar al servidor"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr "Seleccione una base"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "Modo"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "Seleccionar modo de terminal"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Acción"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 "Instalación del sistema en proceso, el estado FAI no puede ser cambiado "
 "actualmente."
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Ejecute"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 msgid "Not matching"
 msgstr "No mostrar los coincidentes"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, php-format
 msgid "IP address %s"
 msgstr "Dirección IP %s"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr "Dirección MAC"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 "¡La dirección IP '%s' no está dentro de la zona inversa seleccionada '%s'!"
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "¡El tipo de registro '%s' está duplicado!"
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "¡El tipo de registro único '%s' está duplicado!"
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
@@ -933,40 +774,40 @@ msgstr ""
 "La dirección IP '%s' se añadira como 'Registro A', esto se hará "
 "automáticamente, por favor elimine el registro."
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Solo están permitidas minúsculas, por favor compruebe su '%ss'."
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Añadir"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Eliminar"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Añadir"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 msgid "DNS settings"
 msgstr "Parametros de DNS"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 msgid "DNS configuration"
 msgstr "Configuración DNS"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 msgid "DHCP configuration"
 msgstr "Configuración DHCP"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 msgid "component"
 msgstr "Componente"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 msgid "Component generic"
 msgstr "Componente genérico"
 
@@ -974,9 +815,63 @@ msgstr "Componente genérico"
 msgid "Device name"
 msgstr "Nombre del dispositivo"
 
-#: admin/systems/component.tpl:20
-msgid "Choose subtree to place component in"
-msgstr "Elija lugar del árbol para colocar el componente"
+#~ msgid "Editing this type of object is not supported yet!"
+#~ msgstr "¡No está soportado editar este tipo de objeto todavía!"
+
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr ""
+#~ "¡La contraseñas introducidas como nueva y reintroduzca contraseña no "
+#~ "coinciden!"
+
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "¡No puedo encontrar el objeto para cambiarle la contraseña!"
+
+#~ msgid "Unknown device"
+#~ msgstr "Dispositivo desconocido"
+
+#~ msgid "New Device"
+#~ msgstr "Nuevo Dispositivo"
+
+#~ msgid "Terminal template for"
+#~ msgstr "Plantilla de terminal para"
+
+#~ msgid "Workstation template for"
+#~ msgstr "Plantilla de estación de trabajo para"
+
+#~ msgid "Template"
+#~ msgstr "Plantilla"
+
+#~ msgid "Windows workstation"
+#~ msgstr "Estaciones de trabajo Windows"
+
+#~ msgid "Workstation error"
+#~ msgstr "Error en estación de trabajo"
+
+#~ msgid "Server error"
+#~ msgstr "Error en servidor"
+
+#~ msgid "Terminal error"
+#~ msgstr "Error en terminal"
+
+#~ msgid "Workstation busy"
+#~ msgstr "Estación de trabajo ocupada"
+
+#~ msgid "Server busy"
+#~ msgstr "Servidor ocupado"
+
+#~ msgid "New system from incoming"
+#~ msgstr "Nuevo sistema desde entrada"
+
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Elija el subárbol donde colocar al servidor"
+
+#~ msgid "Select a base"
+#~ msgstr "Seleccione una base"
+
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "Elija lugar del árbol para colocar el componente"
 
 #~ msgid "Submit"
 #~ msgstr "Enviar"
@@ -1008,9 +903,6 @@ msgstr "Elija lugar del árbol para colocar el componente"
 #~ msgid "Department"
 #~ msgstr "Departamento"
 
-#~ msgid "Release"
-#~ msgstr "Versión"
-
 #~ msgid "servers"
 #~ msgstr "Servidores"
 
@@ -1074,9 +966,6 @@ msgstr "Elija lugar del árbol para colocar el componente"
 #~ msgid "Create FAI CD"
 #~ msgstr "Crear CD FAI"
 
-#~ msgid "Inherited from %s"
-#~ msgstr "Heredado de %s"
-
 #~ msgid "Number of listed '%s'"
 #~ msgstr "Número de mostrados '%s'"
 
diff --git a/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po
index 424a8e914..049aabd37 100644
--- a/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2010-01-28 22:31+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,62 +41,32 @@ msgstr ""
 msgid "Systems"
 msgstr "Systèmes"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "You have no permission to change this password!"
 msgstr "Vous n'êtes pas autorisé à modifier le mot de passe !"
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr "Erreur"
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
@@ -103,112 +74,91 @@ msgstr ""
 "Le mot de passe entré dans le champ 'Nouveau mot de passe' et celui dans le "
 "champ 'Vérification du mot de passe' ne concordent pas !"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 "La méthode de cryptage crypt est manquante. Impossible de créer le mot de "
 "passe."
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Retour"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr "La création de l'image à échoué. veuillez lire le rapport ci dessous."
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
-msgstr "La commande '%s', utilisée dans la création de l'image ISO n'existe pas."
-
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+msgstr ""
+"La commande '%s', utilisée dans la création de l'image ISO n'existe pas."
+
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 msgid "Service infrastructure"
 msgstr "Service d'infrastructure"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 msgid "Permission"
 msgstr "Permissions"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Cannot set mode to 'active'!"
 msgstr "Impossible de mettre le mode comme 'actif' !"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, 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."
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, 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."
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, fuzzy, php-format
+msgid "Inherited from %s"
+msgstr "groupes imbriqués"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 msgid "Incoming objects"
 msgstr "Objets entrants"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 msgid "Incoming"
 msgstr "Entrants"
 
@@ -261,21 +211,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Description"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Créer"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -305,29 +255,29 @@ msgstr "Editer le service"
 msgid "Remove service"
 msgstr "Suppression du service"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "Filter error"
 msgstr "Erreur de Filtre"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Information"
 msgstr "Information"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr "Impossible de mettre à jour le statut avant que cela soit sauvé !"
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 msgid "Cannot update service status!"
 msgstr "Impossible de mettre à jour le statut du service!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nom du serveur"
 
@@ -344,15 +294,15 @@ msgid "Printer name"
 msgstr "Nom de l'imprimante"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 msgid "Component name"
 msgstr "Nom du composant"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr ""
@@ -362,30 +312,26 @@ msgid "Please select the desired entries"
 msgstr "Veuillez sélectionner les entrées désirées"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Serveur"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "Stations de travail"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Nom"
 
@@ -433,141 +379,6 @@ msgstr "Montrer nouveau périphériques"
 msgid "Show OPSI based clients"
 msgstr "Montrer les clients OPSI"
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr "L'édition de ce type d'objet n'est pas encore supporté !"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr ""
-"Le mot de passe entré dans le champ 'Nouveau mot de passe' et celui dans le "
-"champ 'Vérification du mot de passe' ne concordent pas !"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-msgid "Cannot determine object to change password!"
-msgstr "Impossible de déterminer l'objet pour changer son mot de passe !"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "Nouveau terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "Nouvelle station de travail"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-msgid "Unknown device"
-msgstr "Périphérique Inconnu"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr "Nouveau périphérique"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr "Modèle de terminal pour "
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "Modèle de station de travail pour"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "Modèle"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Téléphone"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-msgid "Network device"
-msgstr "Périphérique réseau"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Imprimante"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-msgid "Windows workstation"
-msgstr "Ordinateur Windows"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-msgid "Locked workstation"
-msgstr "Ordinateur verrouillé"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-msgid "Locked server"
-msgstr "Serveur verrouillé"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-msgid "Locked terminal"
-msgstr "Terminal verrouillé"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-msgid "Workstation error"
-msgstr "Erreur d'ordinateur"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-msgid "Server error"
-msgstr "Erreur du serveur"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-msgid "Terminal error"
-msgstr "Erreur du terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-msgid "Workstation busy"
-msgstr "Ordinateur occupé"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-msgid "Server busy"
-msgstr "Serveur occupé"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-msgid "New system from incoming"
-msgstr "Nouveau système depuis incoming"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-msgid "Opsi client"
-msgstr "Clients OPSI"
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Configuration\tréseau"
@@ -592,7 +403,7 @@ msgstr "Autodétection"
 msgid "Enable DHCP for this device"
 msgstr "Activer le DHCP pour ce périphérique"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 msgid "not configured"
 msgstr "non configuré"
 
@@ -604,19 +415,19 @@ msgstr "Noeud Père"
 msgid "Edit settings"
 msgstr "Editer les paramètres"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr "Activer le DNS pour ce périphérique"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr "Enregistrement dns"
 
@@ -628,11 +439,31 @@ msgstr "Liste des systèmes"
 msgid "Opsi host"
 msgstr "Clients OPSI"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "Nouvelle station de travail"
+
+#: admin/systems/system-list.xml:30
+msgid "Locked server"
+msgstr "Serveur verrouillé"
+
+#: admin/systems/system-list.xml:38
+msgid "Locked workstation"
+msgstr "Ordinateur verrouillé"
+
+#: admin/systems/system-list.xml:46
+msgid "Locked terminal"
+msgstr "Terminal verrouillé"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "Nouveau terminal"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 msgid "New unknown device"
 msgstr "Nouveau périphérique Inconnu"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 msgid "New device"
 msgstr "Nouveau périphérique"
 
@@ -648,74 +479,95 @@ msgstr "Modèle de terminal"
 msgid "Winstation"
 msgstr "Pc Windows"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Imprimante"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Téléphone"
+
 #: admin/systems/system-list.xml:143
 msgid "Component"
 msgstr "Composant"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:234
 msgid "Network printer"
 msgstr "Imprimante réseaux"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+msgid "Network device"
+msgstr "Périphérique réseau"
+
+#: admin/systems/system-list.xml:258
+msgid "Opsi client"
+msgstr "Clients OPSI"
+
+#: admin/systems/system-list.xml:270
 msgid "Trigger action"
 msgstr "Déclencher une action"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr "Arrêter"
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "Redémarrer"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 msgid "Wakeup"
 msgstr "Réveiller"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr "Mise à jour"
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 msgid "Activate"
 msgstr "Activer"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr "Reinstaller"
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 msgid "Schedule action"
 msgstr "Programmer une action"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr "Arrêter"
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 msgid "Activate systems"
 msgstr "Activer un système"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 msgid "Create ISO"
 msgstr "Créer un image ISO"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 msgid "Edit role"
 msgstr "Editer un rôle"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 msgid "Remove system"
 msgstr "Suppression du système"
 
@@ -755,164 +607,158 @@ msgstr "Niveau de sécurité du mot de passe"
 msgid "Set password"
 msgstr "Attribuer le mot de passe"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr "Activé"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr "Verrouillé"
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 msgid "server"
 msgstr "serveur"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 msgid "Event error"
 msgstr "Erreur d'événement"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr "L'événement '%s' n'est pas disponible !"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "Eteindre"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 msgid "System update"
 msgstr "Mise à jour du système"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr "Recherche du matériel"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr "Test mémoire"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr "Forcer un démarrage local"
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr "Analyse du système"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "Réveiller"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 msgid "Software deployment"
 msgstr "Déploiement de logiciel"
 
-#: admin/systems/class_servGeneric.inc:372
-msgid "This host is currently installing, if you really want to save it, press 'OK'."
+#: admin/systems/class_servGeneric.inc:358
+msgid ""
+"This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 "Cet hôte est actuellement en cours d'installation, si vous voulez vraiment "
 "le sauver, cliquez sur 'OK'."
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Informations"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 msgid "Server generic"
 msgstr "Serveur générique"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 msgid "Goto mode"
 msgstr "Mode Goto"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 msgid "Root password"
 msgstr "Mot de passe root"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 msgid "Action flag"
 msgstr "Indicateur d'action"
 
-#: admin/systems/server.tpl:26
-msgid "Choose subtree to place server in"
-msgstr "Sélectionnez la branche où sera enregistrée le serveur"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr "Sélectionnez une base"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "Mode"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "Sélectionnez le mode du terminal"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Action"
 
-#: admin/systems/server.tpl:69
-msgid "System installation in progress, the FAI state cannot be changed right now."
+#: admin/systems/server.tpl:63
+msgid ""
+"System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 "Le système est en cours d'installation, l'état FAI ne peut pas être changé "
 "maintenant."
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Exécuter"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 msgid "Not matching"
 msgstr "Pas équivalent"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, php-format
 msgid "IP address %s"
 msgstr "Adresse IP %s"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr "Adresse MAC"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 "L'adresse spécifiée '%s' ne correspond pas à la l'entrée de la zone inverse "
 "sélectionnée '%s'."
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr "L'enregistrement de type '%s' est dupliquée !"
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr "L'enregistrement de type '%s' est dupliqué !"
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
@@ -921,40 +767,41 @@ msgstr ""
 "L'adresse IP '%s' est ajoutée comme un 'A' record, ceci sera fait "
 "automatiquement, veuillez enlever l'enregistrement."
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
-msgstr "Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
-
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Ajouter"
+msgstr ""
+"Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
 
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Supprimer"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Ajouter"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 msgid "DNS settings"
 msgstr "Configuration DNS"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 msgid "DNS configuration"
 msgstr "Configuration du DNS"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 msgid "DHCP configuration"
 msgstr "Configuration de DHCP"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 msgid "component"
 msgstr "composant"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 msgid "Component generic"
 msgstr "Composant générique"
 
@@ -962,7 +809,60 @@ msgstr "Composant générique"
 msgid "Device name"
 msgstr "Nom du périphérique"
 
-#: admin/systems/component.tpl:20
-msgid "Choose subtree to place component in"
-msgstr "Sélectionnez la branche où sera placée le composant"
+#~ msgid "Editing this type of object is not supported yet!"
+#~ msgstr "L'édition de ce type d'objet n'est pas encore supporté !"
+
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr ""
+#~ "Le mot de passe entré dans le champ 'Nouveau mot de passe' et celui dans "
+#~ "le champ 'Vérification du mot de passe' ne concordent pas !"
+
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "Impossible de déterminer l'objet pour changer son mot de passe !"
+
+#~ msgid "Unknown device"
+#~ msgstr "Périphérique Inconnu"
+
+#~ msgid "New Device"
+#~ msgstr "Nouveau périphérique"
+
+#~ msgid "Terminal template for"
+#~ msgstr "Modèle de terminal pour "
+
+#~ msgid "Workstation template for"
+#~ msgstr "Modèle de station de travail pour"
+
+#~ msgid "Template"
+#~ msgstr "Modèle"
+
+#~ msgid "Windows workstation"
+#~ msgstr "Ordinateur Windows"
+
+#~ msgid "Workstation error"
+#~ msgstr "Erreur d'ordinateur"
+
+#~ msgid "Server error"
+#~ msgstr "Erreur du serveur"
+
+#~ msgid "Terminal error"
+#~ msgstr "Erreur du terminal"
+
+#~ msgid "Workstation busy"
+#~ msgstr "Ordinateur occupé"
+
+#~ msgid "Server busy"
+#~ msgstr "Serveur occupé"
+
+#~ msgid "New system from incoming"
+#~ msgstr "Nouveau système depuis incoming"
+
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Sélectionnez la branche où sera enregistrée le serveur"
+
+#~ msgid "Select a base"
+#~ msgstr "Sélectionnez une base"
 
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "Sélectionnez la branche où sera placée le composant"
diff --git a/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po
index 5f18d77f9..3fc2b71cb 100644
--- a/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,181 +39,128 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemi"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "You have no permission to change this password!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 #, fuzzy
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
 msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 #, fuzzy
 msgid "Password method"
 msgstr "Algorimo password"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Indietro"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Cognome"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Cannot set mode to 'active'!"
 msgstr "Vai al dipartimento base"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, fuzzy, php-format
+msgid "Inherited from %s"
+msgstr "Gruppi di oggetti"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 #, fuzzy
 msgid "Incoming objects"
 msgstr "Oggetti membri"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 #, fuzzy
 msgid "Incoming"
 msgstr "Icna"
@@ -269,21 +217,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Descrizione"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "Azioni"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Creare"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -318,32 +266,32 @@ msgstr "Modifica contatto"
 msgid "Remove service"
 msgstr "Elimina contatto"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 #, fuzzy
 msgid "Filter error"
 msgstr "Terminal Server"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 #, fuzzy
 msgid "Information"
 msgstr "Icna"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 #, fuzzy
 msgid "Cannot update service status!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 #, fuzzy
 msgid "Server name"
 msgstr "Cognome"
@@ -363,16 +311,16 @@ msgid "Printer name"
 msgstr "Nome della stampante"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 #, fuzzy
 msgid "Component name"
 msgstr "Nome comune"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Base"
@@ -383,31 +331,27 @@ msgid "Please select the desired entries"
 msgstr "Lingua preferita"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Server"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Cognome"
 
@@ -459,157 +403,6 @@ msgstr "Mostra dispositiva di rete"
 msgid "Show OPSI based clients"
 msgstr ""
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#, fuzzy
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr "Le password nuova e ripetuta non corrispondono"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#, fuzzy
-msgid "Cannot determine object to change password!"
-msgstr "Cambia la password"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-#, fuzzy
-msgid "New terminal"
-msgstr "Mostra terminali"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-#, fuzzy
-msgid "New workstation"
-msgstr "Mostra workstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-msgid "Unknown device"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-#, fuzzy
-msgid "New Device"
-msgstr "Mostra dispositiva di rete"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-#, fuzzy
-msgid "Terminal template for"
-msgstr "Terminal Server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-#, fuzzy
-msgid "Workstation template for"
-msgstr "Mostra workstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Telefono"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-#, fuzzy
-msgid "Network device"
-msgstr "Mostra dispositiva di rete"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Stampante"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-#, fuzzy
-msgid "Windows workstation"
-msgstr "Mostra workstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-#, fuzzy
-msgid "Locked workstation"
-msgstr "Mostra workstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-#, fuzzy
-msgid "Locked server"
-msgstr "Server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-#, fuzzy
-msgid "Locked terminal"
-msgstr "Mostra terminali"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-#, fuzzy
-msgid "Workstation error"
-msgstr "Creare"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-#, fuzzy
-msgid "Server error"
-msgstr "Stato"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-#, fuzzy
-msgid "Terminal error"
-msgstr "Terminal Server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-#, fuzzy
-msgid "Workstation busy"
-msgstr "Mostra workstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-#, fuzzy
-msgid "Server busy"
-msgstr "Server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-#, fuzzy
-msgid "New system from incoming"
-msgstr "Informazioni organizzazione"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-msgid "Opsi client"
-msgstr ""
-
 #: admin/systems/network.tpl:1
 #, fuzzy
 msgid "Network\tsettings"
@@ -639,7 +432,7 @@ msgstr "automatico"
 msgid "Enable DHCP for this device"
 msgstr "Elimina foto"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 #, fuzzy
 msgid "not configured"
 msgstr "non configurata"
@@ -654,21 +447,21 @@ msgstr "server"
 msgid "Edit settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 #, fuzzy
 msgid "Enable DNS for this device"
 msgstr "Elimina foto"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 #, fuzzy
 msgid "Zone"
 msgstr "telefoni"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 #, fuzzy
 msgid "Dns records"
 msgstr "Directory"
@@ -681,12 +474,37 @@ msgstr "Lista dei sistemi"
 msgid "Opsi host"
 msgstr ""
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+#, fuzzy
+msgid "New workstation"
+msgstr "Mostra workstation"
+
+#: admin/systems/system-list.xml:30
+#, fuzzy
+msgid "Locked server"
+msgstr "Server"
+
+#: admin/systems/system-list.xml:38
+#, fuzzy
+msgid "Locked workstation"
+msgstr "Mostra workstation"
+
+#: admin/systems/system-list.xml:46
+#, fuzzy
+msgid "Locked terminal"
+msgstr "Mostra terminali"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+#, fuzzy
+msgid "New terminal"
+msgstr "Mostra terminali"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 #, fuzzy
 msgid "New unknown device"
 msgstr "Mostra dispositiva di rete"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 #, fuzzy
 msgid "New device"
 msgstr "Mostra dispositiva di rete"
@@ -706,83 +524,106 @@ msgstr "Terminal Server"
 msgid "Winstation"
 msgstr "Amministrazione"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Stampante"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Telefono"
+
 #: admin/systems/system-list.xml:143
 #, fuzzy
 msgid "Component"
 msgstr "Nome comune"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+#, fuzzy
+msgid "Release"
+msgstr "Rimuovi"
+
+#: admin/systems/system-list.xml:234
 #, fuzzy
 msgid "Network printer"
 msgstr "Mostra stampanti di rete"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+#, fuzzy
+msgid "Network device"
+msgstr "Mostra dispositiva di rete"
+
+#: admin/systems/system-list.xml:258
+msgid "Opsi client"
+msgstr ""
+
+#: admin/systems/system-list.xml:270
 #, fuzzy
 msgid "Trigger action"
 msgstr "Amministrazione utenti"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr ""
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 #, fuzzy
 msgid "Reboot"
 msgstr "Root"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 msgid "Wakeup"
 msgstr ""
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr ""
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 msgid "Lock"
 msgstr ""
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 #, fuzzy
 msgid "Activate"
 msgstr "Privato"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 #, fuzzy
 msgid "Schedule action"
 msgstr "Estenzioni PHPGroupware"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr ""
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 #, fuzzy
 msgid "Activate systems"
 msgstr "Lista dei sistemi"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 #, fuzzy
 msgid "Create ISO"
 msgstr "Creare"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 #, fuzzy
 msgid "Edit role"
 msgstr "Modifica contatto"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 #, fuzzy
 msgid "Remove system"
 msgstr "Elimina foto"
@@ -826,222 +667,212 @@ msgstr "Algorimo password"
 msgid "Set password"
 msgstr "Cambia password"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 #, fuzzy
 msgid "Activated"
 msgstr "Privato"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 #, fuzzy
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 #, fuzzy
 msgid "Event error"
 msgstr "Stato"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Cambia la password"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 #, fuzzy
 msgid "System update"
 msgstr "Dipartimento"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 #, fuzzy
 msgid "Rescan hardware"
 msgstr "Dispositivo telefonico"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 #, fuzzy
 msgid "System analysis"
 msgstr "Log di sitema"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 #, fuzzy
 msgid "Software deployment"
 msgstr "Dipartimento"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Generale"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 #, fuzzy
 msgid "Server generic"
 msgstr "Cognome"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 #, fuzzy
 msgid "Goto mode"
 msgstr "nella cartella"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 #, fuzzy
 msgid "Root password"
 msgstr "Cambia password"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Action flag"
 msgstr "Azione"
 
-#: admin/systems/server.tpl:26
-#, fuzzy
-msgid "Choose subtree to place server in"
-msgstr "Scegli il subtree per l'utente"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-#, fuzzy
-msgid "Select a base"
-msgstr "Rimuovi"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 #, fuzzy
 msgid "Mode"
 msgstr "Dominio"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 #, fuzzy
 msgid "Select terminal mode"
 msgstr "Seleziona un sistema da aggiungere"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Azione"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 #, fuzzy
 msgid "Select action to execute for this server"
 msgstr "Mostra gruppi che contengono server"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Esegui"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, fuzzy, php-format
 msgid "IP address %s"
 msgstr "Indirizzo principale"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 #, fuzzy
 msgid "IP address"
 msgstr "Indirizzo principale"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 #, fuzzy
 msgid "MAC address"
 msgstr "Indirizzo principale"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Aggiungi"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Rimuovi"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Aggiungi"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 #, fuzzy
 msgid "DNS settings"
 msgstr "Impostazioni Samba"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 #, fuzzy
 msgid "DNS configuration"
 msgstr "Scarica il file di  configurazione"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "Scarica il file di  configurazione"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 #, fuzzy
 msgid "component"
 msgstr "Nome comune"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 msgid "Component generic"
 msgstr ""
 
@@ -1050,23 +881,76 @@ msgstr ""
 msgid "Device name"
 msgstr "Nome"
 
-#: admin/systems/component.tpl:20
 #, fuzzy
-msgid "Choose subtree to place component in"
-msgstr "Scegli il subtree dove mettere il gruppo"
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr "Le password nuova e ripetuta non corrispondono"
 
 #, fuzzy
-#~ msgid "Select all"
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "Cambia la password"
+
+#, fuzzy
+#~ msgid "New Device"
+#~ msgstr "Mostra dispositiva di rete"
+
+#, fuzzy
+#~ msgid "Terminal template for"
+#~ msgstr "Terminal Server"
+
+#, fuzzy
+#~ msgid "Workstation template for"
+#~ msgstr "Mostra workstation"
+
+#, fuzzy
+#~ msgid "Windows workstation"
+#~ msgstr "Mostra workstation"
+
+#, fuzzy
+#~ msgid "Workstation error"
+#~ msgstr "Creare"
+
+#, fuzzy
+#~ msgid "Server error"
+#~ msgstr "Stato"
+
+#, fuzzy
+#~ msgid "Terminal error"
+#~ msgstr "Terminal Server"
+
+#, fuzzy
+#~ msgid "Workstation busy"
+#~ msgstr "Mostra workstation"
+
+#, fuzzy
+#~ msgid "Server busy"
+#~ msgstr "Server"
+
+#, fuzzy
+#~ msgid "New system from incoming"
+#~ msgstr "Informazioni organizzazione"
+
+#, fuzzy
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Scegli il subtree per l'utente"
+
+#, fuzzy
+#~ msgid "Select a base"
 #~ msgstr "Rimuovi"
 
 #, fuzzy
-#~ msgid "Department"
-#~ msgstr "Dipartimento"
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "Scegli il subtree dove mettere il gruppo"
 
 #, fuzzy
-#~ msgid "Release"
+#~ msgid "Select all"
 #~ msgstr "Rimuovi"
 
+#, fuzzy
+#~ msgid "Department"
+#~ msgstr "Dipartimento"
+
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "Server"
@@ -1158,10 +1042,6 @@ msgstr "Scegli il subtree dove mettere il gruppo"
 #~ msgid "Create FAI CD"
 #~ msgstr "Gruppo di oggetti"
 
-#, fuzzy
-#~ msgid "Inherited from %s"
-#~ msgstr "Gruppi di oggetti"
-
 #, fuzzy
 #~ msgid "Number of listed '%s'"
 #~ msgstr "Server"
diff --git a/gosa-plugins/systems/locale/messages.po b/gosa-plugins/systems/locale/messages.po
index 29c0e3a67..fd4b25e01 100644
--- a/gosa-plugins/systems/locale/messages.po
+++ b/gosa-plugins/systems/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,171 +37,118 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "Permission error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 msgid "You have no permission to change this password!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 msgid "LDAP error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 msgid "Service infrastructure"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 msgid "Permission"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Internal error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 msgid "Cannot set mode to 'active'!"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, php-format
+msgid "Inherited from %s"
+msgstr ""
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 msgid "Incoming objects"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 msgid "Incoming"
 msgstr ""
 
@@ -250,21 +198,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr ""
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr ""
 
@@ -294,29 +242,29 @@ msgstr ""
 msgid "Remove service"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "Filter error"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Information"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 msgid "Cannot update service status!"
 msgstr ""
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr ""
 
@@ -333,15 +281,15 @@ msgid "Printer name"
 msgstr ""
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 msgid "Component name"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr ""
@@ -351,30 +299,26 @@ msgid "Please select the desired entries"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr ""
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr ""
 
@@ -422,139 +366,6 @@ msgstr ""
 msgid "Show OPSI based clients"
 msgstr ""
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-msgid "Cannot determine object to change password!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-msgid "Unknown device"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-msgid "Network device"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-msgid "Windows workstation"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-msgid "Locked workstation"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-msgid "Locked server"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-msgid "Locked terminal"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-msgid "Workstation error"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-msgid "Server error"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-msgid "Terminal error"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-msgid "Workstation busy"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-msgid "Server busy"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-msgid "New system from incoming"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-msgid "Opsi client"
-msgstr ""
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr ""
@@ -579,7 +390,7 @@ msgstr ""
 msgid "Enable DHCP for this device"
 msgstr ""
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 msgid "not configured"
 msgstr ""
 
@@ -591,19 +402,19 @@ msgstr ""
 msgid "Edit settings"
 msgstr ""
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr ""
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr ""
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr ""
 
@@ -615,11 +426,31 @@ msgstr ""
 msgid "Opsi host"
 msgstr ""
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:30
+msgid "Locked server"
+msgstr ""
+
+#: admin/systems/system-list.xml:38
+msgid "Locked workstation"
+msgstr ""
+
+#: admin/systems/system-list.xml:46
+msgid "Locked terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr ""
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 msgid "New unknown device"
 msgstr ""
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 msgid "New device"
 msgstr ""
 
@@ -635,74 +466,95 @@ msgstr ""
 msgid "Winstation"
 msgstr ""
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr ""
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr ""
+
 #: admin/systems/system-list.xml:143
 msgid "Component"
 msgstr ""
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+msgid "Release"
+msgstr ""
+
+#: admin/systems/system-list.xml:234
 msgid "Network printer"
 msgstr ""
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+msgid "Network device"
+msgstr ""
+
+#: admin/systems/system-list.xml:258
+msgid "Opsi client"
+msgstr ""
+
+#: admin/systems/system-list.xml:270
 msgid "Trigger action"
 msgstr ""
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr ""
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr ""
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 msgid "Wakeup"
 msgstr ""
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr ""
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 msgid "Lock"
 msgstr ""
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 msgid "Activate"
 msgstr ""
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 msgid "Schedule action"
 msgstr ""
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr ""
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 msgid "Activate systems"
 msgstr ""
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr ""
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 msgid "Create ISO"
 msgstr ""
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 msgid "Edit role"
 msgstr ""
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 msgid "Remove system"
 msgstr ""
 
@@ -737,207 +589,195 @@ msgstr ""
 msgid "Set password"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 msgid "server"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 msgid "Event error"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, php-format
 msgid "Event '%s' is not available!"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 msgid "System update"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 msgid "Software deployment"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 msgid "Server generic"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 msgid "Goto mode"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 msgid "Root password"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 msgid "Action flag"
 msgstr ""
 
-#: admin/systems/server.tpl:26
-msgid "Choose subtree to place server in"
-msgstr ""
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr ""
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr ""
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr ""
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr ""
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr ""
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 msgid "Not matching"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, php-format
 msgid "IP address %s"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 msgid "IP address"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
+#: admin/systems/class_termDNS.inc:960
+msgid "Delete"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:964
-msgid "Delete"
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 msgid "DNS settings"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 msgid "DNS configuration"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 msgid "DHCP configuration"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 msgid "component"
 msgstr ""
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 msgid "Component generic"
 msgstr ""
 
 #: admin/systems/component.tpl:6
 msgid "Device name"
 msgstr ""
-
-#: admin/systems/component.tpl:20
-msgid "Choose subtree to place component in"
-msgstr ""
diff --git a/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po
index 2cc6b49b6..e957e2a91 100644
--- a/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,64 +45,34 @@ msgstr ""
 msgid "Systems"
 msgstr "Systemen"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "You have no permission to change this password!"
 msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen"
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr "Fout"
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 #, fuzzy
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
@@ -110,119 +81,96 @@ msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen!"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 #, fuzzy
 msgid "Password method"
 msgstr "Wachtwoord encryptie"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Terug"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, fuzzy, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Apparaat naam"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Cannot set mode to 'active'!"
 msgstr "Ga naar basis afdelingen"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, fuzzy, php-format
+msgid "Inherited from %s"
+msgstr "Objectgroepen"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 #, fuzzy
 msgid "Incoming objects"
 msgstr "Lidmaatschap objecten"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 #, fuzzy
 msgid "Incoming"
 msgstr "Icoon"
@@ -279,21 +227,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Omschrijving"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "Acties"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Aanmaken"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -327,32 +275,32 @@ msgstr "Print service"
 msgid "Remove service"
 msgstr "Verwijder DNS service"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 #, fuzzy
 msgid "Filter error"
 msgstr "Terminal server"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 #, fuzzy
 msgid "Information"
 msgstr "Werkstation"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 #, fuzzy
 msgid "Cannot update service status!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Servernaam"
 
@@ -370,16 +318,16 @@ msgid "Printer name"
 msgstr "Printernaam"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 #, fuzzy
 msgid "Component name"
 msgstr "Algemene naam"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Basis"
@@ -390,30 +338,26 @@ msgid "Please select the desired entries"
 msgstr "Voorkeurstaal"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Server"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "Werkstation"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr "Terminal"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Naam"
 
@@ -465,156 +409,6 @@ msgstr "Toon netwerk apparaten"
 msgid "Show OPSI based clients"
 msgstr ""
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#, fuzzy
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr ""
-"Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
-"overeen!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#, fuzzy
-msgid "Cannot determine object to change password!"
-msgstr "Kan de objectnaam niet detecteren"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "Nieuwe terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "Nieuw werkstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-#, fuzzy
-msgid "Unknown device"
-msgstr "Onbekend"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr "Nieuw apparaat"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr "Terminal sjabloon voor"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "Werkstation sjabloon voor"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "Sjabloon"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Telefoon"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-#, fuzzy
-msgid "Network device"
-msgstr "Netwerk apparaten"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Printer"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-#, fuzzy
-msgid "Windows workstation"
-msgstr "Toon werkstations"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-#, fuzzy
-msgid "Locked workstation"
-msgstr "Nieuw werkstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-#, fuzzy
-msgid "Locked server"
-msgstr "Ldap server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-#, fuzzy
-msgid "Locked terminal"
-msgstr "Nieuwe terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-#, fuzzy
-msgid "Workstation error"
-msgstr "Werkstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-#, fuzzy
-msgid "Server error"
-msgstr "Servernaam"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-#, fuzzy
-msgid "Terminal error"
-msgstr "Terminal server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-#, fuzzy
-msgid "Workstation busy"
-msgstr "Werkstation"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-#, fuzzy
-msgid "Server busy"
-msgstr "Servers"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-#, fuzzy
-msgid "New system from incoming"
-msgstr "Nieuw systeem uit inkomende wachtrij"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-#, fuzzy
-msgid "Opsi client"
-msgstr "Thin Client"
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Netwerk\tinstellingen"
@@ -641,7 +435,7 @@ msgstr "Auto detect."
 msgid "Enable DHCP for this device"
 msgstr "DNS voor dit apparaat activeren"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 #, fuzzy
 msgid "not configured"
 msgstr "niet geconfigureerd"
@@ -656,19 +450,19 @@ msgstr "Hoofd/Parent server"
 msgid "Edit settings"
 msgstr "E-mail instellingen"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr "DNS voor dit apparaat activeren"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr "DNS records"
 
@@ -681,12 +475,35 @@ msgstr "Lijst met systemen"
 msgid "Opsi host"
 msgstr "Thin Client"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "Nieuw werkstation"
+
+#: admin/systems/system-list.xml:30
+#, fuzzy
+msgid "Locked server"
+msgstr "Ldap server"
+
+#: admin/systems/system-list.xml:38
+#, fuzzy
+msgid "Locked workstation"
+msgstr "Nieuw werkstation"
+
+#: admin/systems/system-list.xml:46
+#, fuzzy
+msgid "Locked terminal"
+msgstr "Nieuwe terminal"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "Nieuwe terminal"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 #, fuzzy
 msgid "New unknown device"
 msgstr "Onbekend"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 #, fuzzy
 msgid "New device"
 msgstr "Nieuw apparaat"
@@ -705,84 +522,108 @@ msgstr "Terminal sjabloon voor"
 msgid "Winstation"
 msgstr "Windows werkstation"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Printer"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Telefoon"
+
 #: admin/systems/system-list.xml:143
 #, fuzzy
 msgid "Component"
 msgstr "Nieuw component"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+#, fuzzy
+msgid "Release"
+msgstr "Verwijderen"
+
+#: admin/systems/system-list.xml:234
 #, fuzzy
 msgid "Network printer"
 msgstr "Toon netwerk printers"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+#, fuzzy
+msgid "Network device"
+msgstr "Netwerk apparaten"
+
+#: admin/systems/system-list.xml:258
+#, fuzzy
+msgid "Opsi client"
+msgstr "Thin Client"
+
+#: admin/systems/system-list.xml:270
 #, fuzzy
 msgid "Trigger action"
 msgstr "Informatie weergeven/verbergen"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr ""
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "Herstarten"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 #, fuzzy
 msgid "Wakeup"
 msgstr "Aanzetten"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr ""
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 #, fuzzy
 msgid "Lock"
 msgstr "Geblokkeerd"
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 #, fuzzy
 msgid "Activate"
 msgstr "Geactiveerd"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr "Herinstalleer"
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 #, fuzzy
 msgid "Schedule action"
 msgstr "Geplande bijwerking"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr ""
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 #, fuzzy
 msgid "Activate systems"
 msgstr "Bewerk systeem"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 #, fuzzy
 msgid "Create ISO"
 msgstr "Aanmaken"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 #, fuzzy
 msgid "Edit role"
 msgstr "Bewerk share"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 #, fuzzy
 msgid "Remove system"
 msgstr "Plaatje verwijderen"
@@ -823,171 +664,162 @@ msgstr "Wachtwoord encryptie"
 msgid "Set password"
 msgstr "Wachtwoord instellen"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr "Geactiveerd"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr "Geblokkeerd"
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 #, fuzzy
 msgid "server"
 msgstr "Server"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 #, fuzzy
 msgid "Event error"
 msgstr "Systeem status"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "Uitschakelen"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 #, fuzzy
 msgid "System update"
 msgstr "Systeem / Afdeling"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr "Hardware opnieuw scannen"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr "Geheugentest"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr "Systeem analyse"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "Aanzetten"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 #, fuzzy
 msgid "Software deployment"
 msgstr "Systeembeheer"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Algemeen"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 #, fuzzy
 msgid "Server generic"
 msgstr "Servernaam"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 #, fuzzy
 msgid "Goto mode"
 msgstr "naar map"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 #, fuzzy
 msgid "Root password"
 msgstr "Wachtwoord instellen"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Action flag"
 msgstr "Actie"
 
-#: admin/systems/server.tpl:26
-#, fuzzy
-msgid "Choose subtree to place server in"
-msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr "Selecteer een basis"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "Modus"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "Selecteer terminal modus"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Actie"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr "Selecteer de voor deze server uit te voeren actie"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Commando"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 #, fuzzy
 msgid "Not matching"
 msgstr "Niet actief"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, fuzzy, php-format
 msgid "IP address %s"
 msgstr "IP adres"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 #, fuzzy
 msgid "IP address"
 msgstr "IP adres"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr "Hardware adres (MAC)"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, fuzzy, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
@@ -996,44 +828,44 @@ msgstr ""
 "Het apparaat IP '%s' is toegevoegd als 'A Record'. Dit wordt automatisch "
 "afgehandeld door GOsa. Verwijder het record a.u.b."
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, fuzzy, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Toevoegen"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Toevoegen"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 #, fuzzy
 msgid "DNS settings"
 msgstr "Samba Instellingen"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 #, fuzzy
 msgid "DNS configuration"
 msgstr "FAX database"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "FAX database"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 #, fuzzy
 msgid "component"
 msgstr "Nieuw component"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 #, fuzzy
 msgid "Component generic"
 msgstr "Nieuw component"
@@ -1042,10 +874,72 @@ msgstr "Nieuw component"
 msgid "Device name"
 msgstr "Apparaat naam"
 
-#: admin/systems/component.tpl:20
 #, fuzzy
-msgid "Choose subtree to place component in"
-msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr ""
+#~ "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
+#~ "overeen!"
+
+#, fuzzy
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "Kan de objectnaam niet detecteren"
+
+#, fuzzy
+#~ msgid "Unknown device"
+#~ msgstr "Onbekend"
+
+#~ msgid "New Device"
+#~ msgstr "Nieuw apparaat"
+
+#~ msgid "Terminal template for"
+#~ msgstr "Terminal sjabloon voor"
+
+#~ msgid "Workstation template for"
+#~ msgstr "Werkstation sjabloon voor"
+
+#~ msgid "Template"
+#~ msgstr "Sjabloon"
+
+#, fuzzy
+#~ msgid "Windows workstation"
+#~ msgstr "Toon werkstations"
+
+#, fuzzy
+#~ msgid "Workstation error"
+#~ msgstr "Werkstation"
+
+#, fuzzy
+#~ msgid "Server error"
+#~ msgstr "Servernaam"
+
+#, fuzzy
+#~ msgid "Terminal error"
+#~ msgstr "Terminal server"
+
+#, fuzzy
+#~ msgid "Workstation busy"
+#~ msgstr "Werkstation"
+
+#, fuzzy
+#~ msgid "Server busy"
+#~ msgstr "Servers"
+
+#, fuzzy
+#~ msgid "New system from incoming"
+#~ msgstr "Nieuw systeem uit inkomende wachtrij"
+
+#, fuzzy
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
+
+#~ msgid "Select a base"
+#~ msgstr "Selecteer een basis"
+
+#, fuzzy
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 
 #~ msgid "Submit"
 #~ msgstr "Verwerk"
@@ -1058,10 +952,6 @@ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 #~ msgid "Department"
 #~ msgstr "Systeem / Afdeling"
 
-#, fuzzy
-#~ msgid "Release"
-#~ msgstr "Verwijderen"
-
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "Server"
@@ -1150,10 +1040,6 @@ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 #~ msgid "Create FAI CD"
 #~ msgstr "Nieuw FAI object aanmaken"
 
-#, fuzzy
-#~ msgid "Inherited from %s"
-#~ msgstr "Objectgroepen"
-
 #, fuzzy
 #~ msgid "Number of listed '%s'"
 #~ msgstr "Naam van de afdeling"
@@ -1612,8 +1498,8 @@ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
 #~ "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to "
 #~ "exist."
 #~ msgstr ""
-#~ "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%"
-#~ "s' bestaat niet."
+#~ "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module "
+#~ "'%s' bestaat niet."
 
 #~ msgid "The required field 'Component name' is not set."
 #~ msgstr "Het vereiste veld 'Component naam' is leeg."
diff --git a/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po
index 33baa9fc8..3dd3245d4 100644
--- a/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,181 +40,128 @@ msgstr ""
 msgid "Systems"
 msgstr "Systemy"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "You have no permission to change this password!"
 msgstr "Brak uprawnień do zmiany własnego hasła w tym momencie"
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr "Błąd"
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 #, fuzzy
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
 msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 #, fuzzy
 msgid "Password method"
 msgstr "Przechowywanie hasła"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Wróć"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, fuzzy, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Nazwa usługi"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy
 msgid "Permission"
 msgstr "Uprawnienia"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Cannot set mode to 'active'!"
 msgstr "Utwórz nowy departament"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Brak uprawnień do zmiany przekazywania poczty"
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Brak uprawnień do zmiany przekazywania poczty"
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, fuzzy, php-format
+msgid "Inherited from %s"
+msgstr "Grupy obiektów"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 #, fuzzy
 msgid "Incoming objects"
 msgstr "Przenieś obiekty"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 #, fuzzy
 msgid "Incoming"
 msgstr "Ikona"
@@ -271,21 +219,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Opis"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "Akcje"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Utwórz"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Usuń"
 
@@ -315,33 +263,33 @@ msgstr "Edytuj usługę"
 msgid "Remove service"
 msgstr "Usuń usługę"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 #, fuzzy
 msgid "Filter error"
 msgstr "Błąd krytyczny"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 #, fuzzy
 msgid "Information"
 msgstr "Stacja robocza"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 #, fuzzy
 msgid "Cannot update service status until it has been saved!"
 msgstr "Nie można ustawić statusu podczas gdy nie zapisano tego serwera."
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 #, fuzzy
 msgid "Cannot update service status!"
 msgstr "Nie można otworzyć wybranego certyfikatu!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nazwa serwera"
 
@@ -359,16 +307,16 @@ msgid "Printer name"
 msgstr "nazwa drukarki"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 #, fuzzy
 msgid "Component name"
 msgstr "Nazwa potoczna"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Kontener"
@@ -379,30 +327,26 @@ msgid "Please select the desired entries"
 msgstr "Preferowany język"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Serwer"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "Stacja robocza"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr "Terminal"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Imię"
 
@@ -454,153 +398,6 @@ msgstr "Pokaż urządzenia sieciowe"
 msgid "Show OPSI based clients"
 msgstr ""
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#, fuzzy
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#, fuzzy
-msgid "Cannot determine object to change password!"
-msgstr "Nie można wykryć nazwy obiektu."
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "Nowy terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "Nowa stacja robocza"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-#, fuzzy
-msgid "Unknown device"
-msgstr "Nieznane"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr "Nowe urządzenie"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr "Szablon terminala dla"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "Szablon stacji roboczej dla"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "Szablon"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Telefon"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-msgid "Network device"
-msgstr "Urządzenia sieciowe"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Drukarka"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-#, fuzzy
-msgid "Windows workstation"
-msgstr "Pokaż stacje robocze"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-#, fuzzy
-msgid "Locked workstation"
-msgstr "Nowa stacja robocza"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-#, fuzzy
-msgid "Locked server"
-msgstr "Serwer Ldap"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-#, fuzzy
-msgid "Locked terminal"
-msgstr "Nowy terminal"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-#, fuzzy
-msgid "Workstation error"
-msgstr "Stacja robocza"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-#, fuzzy
-msgid "Server error"
-msgstr "Nazwa serwera"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-#, fuzzy
-msgid "Terminal error"
-msgstr "Terminal Server"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-#, fuzzy
-msgid "Workstation busy"
-msgstr "Stacja robocza"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-#, fuzzy
-msgid "Server busy"
-msgstr "Serwery"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-#, fuzzy
-msgid "New system from incoming"
-msgstr "Nowy system dla nadchodzących"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-#, fuzzy
-msgid "Opsi client"
-msgstr "Cienki klient"
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Ustawienia sieci"
@@ -627,7 +424,7 @@ msgstr "Autowykrywanie"
 msgid "Enable DHCP for this device"
 msgstr "Włącz DNS dla tego urządzenia."
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 #, fuzzy
 msgid "not configured"
 msgstr "nieskonfigurowane"
@@ -642,19 +439,19 @@ msgstr "Nadrzędny serwer"
 msgid "Edit settings"
 msgstr "Ustawienia pocztowe"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr "Włącz DNS dla tego urządzenia."
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr "Strefa"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr "Rekordy DNS"
 
@@ -667,12 +464,35 @@ msgstr "Lista systemów"
 msgid "Opsi host"
 msgstr "Cienki klient"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "Nowa stacja robocza"
+
+#: admin/systems/system-list.xml:30
+#, fuzzy
+msgid "Locked server"
+msgstr "Serwer Ldap"
+
+#: admin/systems/system-list.xml:38
+#, fuzzy
+msgid "Locked workstation"
+msgstr "Nowa stacja robocza"
+
+#: admin/systems/system-list.xml:46
+#, fuzzy
+msgid "Locked terminal"
+msgstr "Nowy terminal"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "Nowy terminal"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 #, fuzzy
 msgid "New unknown device"
 msgstr "Nieznane"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 #, fuzzy
 msgid "New device"
 msgstr "Nowe urządzenie"
@@ -691,84 +511,107 @@ msgstr "Szablon terminala dla"
 msgid "Winstation"
 msgstr "Stacja Windows"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Drukarka"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Telefon"
+
 #: admin/systems/system-list.xml:143
 #, fuzzy
 msgid "Component"
 msgstr "Nowy komponent"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+#, fuzzy
+msgid "Release"
+msgstr "Usuń"
+
+#: admin/systems/system-list.xml:234
 #, fuzzy
 msgid "Network printer"
 msgstr "Pokaż drukarki sieciowe"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+msgid "Network device"
+msgstr "Urządzenia sieciowe"
+
+#: admin/systems/system-list.xml:258
+#, fuzzy
+msgid "Opsi client"
+msgstr "Cienki klient"
+
+#: admin/systems/system-list.xml:270
 #, fuzzy
 msgid "Trigger action"
 msgstr "Przełącz informacje"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr ""
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "Restartuj"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 #, fuzzy
 msgid "Wakeup"
 msgstr "Zbudź"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 #, fuzzy
 msgid "Lock"
 msgstr "Zablokowane"
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 #, fuzzy
 msgid "Activate"
 msgstr "Aktywne"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr "Przeinstaluj"
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 #, fuzzy
 msgid "Schedule action"
 msgstr "Zaplanowana aktualizacja"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr ""
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 #, fuzzy
 msgid "Activate systems"
 msgstr "Edytuj system"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 #, fuzzy
 msgid "Create ISO"
 msgstr "Utwórz"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 #, fuzzy
 msgid "Edit role"
 msgstr "Edytuj makro"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 #, fuzzy
 msgid "Remove system"
 msgstr "Usuń obrazek"
@@ -808,169 +651,160 @@ msgstr "Przechowywanie hasła"
 msgid "Set password"
 msgstr "Ustaw hasło"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr "Aktywne"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr "Zablokowane"
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 #, fuzzy
 msgid "server"
 msgstr "Serwer"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 #, fuzzy
 msgid "Event error"
 msgstr "Ustaw status"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Brak uprawnień do zmiay hasła"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "Wyłącz"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 #, fuzzy
 msgid "System update"
 msgstr "System / Departament"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr "Przeskanuj sprzęt"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr "Test pamięci"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr "Analiza systemu"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "Zbudź"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 #, fuzzy
 msgid "Software deployment"
 msgstr "Zarządzanie systemem"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Ogólne"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 #, fuzzy
 msgid "Server generic"
 msgstr "Nazwa serwera"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 #, fuzzy
 msgid "Goto mode"
 msgstr "do folferu"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 #, fuzzy
 msgid "Root password"
 msgstr "Ustaw hasło"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 msgid "Action flag"
 msgstr "Flaga akcji"
 
-#: admin/systems/server.tpl:26
-#, fuzzy
-msgid "Choose subtree to place server in"
-msgstr "Wybierz poddrzewo do umieszczenia konta."
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr "Wybierz bazę"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "Tryb"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "Proszę wybrać tryb terminala"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Akcja"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr "Proszę wybrać akcję do wykonania dla tego serwera"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Uruchom"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 #, fuzzy
 msgid "Not matching"
 msgstr "Nieaktywne"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, fuzzy, php-format
 msgid "IP address %s"
 msgstr "adres IP"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 msgid "IP address"
 msgstr "adres IP"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr "Adres MAC"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, fuzzy, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
@@ -979,43 +813,43 @@ msgstr ""
 "IP '%s' urządzenia jest dodane jako 'rekord A', to zostanie dodane "
 "automatycznie. Proszę usunąć rekord."
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, fuzzy, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "Tylko małe litery są dozwolone, proszę sprawdzić '%s'."
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Dodaj"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Usuń"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Dodaj"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 msgid "DNS settings"
 msgstr "Ustawienia DNS"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 #, fuzzy
 msgid "DNS configuration"
 msgstr "Konfiguracja bazy FAX"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "Konfiguracja bazy FAX"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 #, fuzzy
 msgid "component"
 msgstr "Nowy komponent"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 #, fuzzy
 msgid "Component generic"
 msgstr "Nowy komponent"
@@ -1024,10 +858,70 @@ msgstr "Nowy komponent"
 msgid "Device name"
 msgstr "Nazwa urządzenia"
 
-#: admin/systems/component.tpl:20
 #, fuzzy
-msgid "Choose subtree to place component in"
-msgstr "Wybierz poddrzewo do umieszczenia grupy"
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
+
+#, fuzzy
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "Nie można wykryć nazwy obiektu."
+
+#, fuzzy
+#~ msgid "Unknown device"
+#~ msgstr "Nieznane"
+
+#~ msgid "New Device"
+#~ msgstr "Nowe urządzenie"
+
+#~ msgid "Terminal template for"
+#~ msgstr "Szablon terminala dla"
+
+#~ msgid "Workstation template for"
+#~ msgstr "Szablon stacji roboczej dla"
+
+#~ msgid "Template"
+#~ msgstr "Szablon"
+
+#, fuzzy
+#~ msgid "Windows workstation"
+#~ msgstr "Pokaż stacje robocze"
+
+#, fuzzy
+#~ msgid "Workstation error"
+#~ msgstr "Stacja robocza"
+
+#, fuzzy
+#~ msgid "Server error"
+#~ msgstr "Nazwa serwera"
+
+#, fuzzy
+#~ msgid "Terminal error"
+#~ msgstr "Terminal Server"
+
+#, fuzzy
+#~ msgid "Workstation busy"
+#~ msgstr "Stacja robocza"
+
+#, fuzzy
+#~ msgid "Server busy"
+#~ msgstr "Serwery"
+
+#, fuzzy
+#~ msgid "New system from incoming"
+#~ msgstr "Nowy system dla nadchodzących"
+
+#, fuzzy
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia konta."
+
+#~ msgid "Select a base"
+#~ msgstr "Wybierz bazę"
+
+#, fuzzy
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "Wybierz poddrzewo do umieszczenia grupy"
 
 #~ msgid "Submit"
 #~ msgstr "Wyślij"
@@ -1040,10 +934,6 @@ msgstr "Wybierz poddrzewo do umieszczenia grupy"
 #~ msgid "Department"
 #~ msgstr "System / Departament"
 
-#, fuzzy
-#~ msgid "Release"
-#~ msgstr "Usuń"
-
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "Serwer"
@@ -1132,10 +1022,6 @@ msgstr "Wybierz poddrzewo do umieszczenia grupy"
 #~ msgid "Create FAI CD"
 #~ msgstr "Utwórz nowy obiekt FAI"
 
-#, fuzzy
-#~ msgid "Inherited from %s"
-#~ msgstr "Grupy obiektów"
-
 #, fuzzy
 #~ msgid "Number of listed '%s'"
 #~ msgstr "Nazwa departamentu"
diff --git a/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po
index 3ac2eb79c..8f35a7df1 100644
--- a/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,182 +42,129 @@ msgstr ""
 msgid "Systems"
 msgstr "Системы"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "You have no permission to change this password!"
 msgstr "Вам не разрешено менять пароль."
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 #, fuzzy
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 #, fuzzy
 msgid "Password method"
 msgstr "Хэширование паролей"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "Назад"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, fuzzy, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "Имя сервера"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Internal error"
 msgstr "Терминал-сервер"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Cannot set mode to 'active'!"
 msgstr "Список подразделений"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "Вам не разрешено менять пароль."
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "Вам не разрешено менять пароль."
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, fuzzy, php-format
+msgid "Inherited from %s"
+msgstr "Объединения"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 #, fuzzy
 msgid "Incoming objects"
 msgstr "Включаемые объекты"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 #, fuzzy
 msgid "Incoming"
 msgstr "Пиктограмма"
@@ -273,21 +221,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "Описание"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "Действия"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "Создать"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "Удалить"
 
@@ -322,32 +270,32 @@ msgstr "Служба печати"
 msgid "Remove service"
 msgstr "Удалить сервис DNS"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 #, fuzzy
 msgid "Filter error"
 msgstr "Терминал-сервер"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 #, fuzzy
 msgid "Information"
 msgstr "Рабочая станция"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 #, fuzzy
 msgid "Cannot update service status!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Имя сервера"
 
@@ -365,16 +313,16 @@ msgid "Printer name"
 msgstr "Имя принтера"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 #, fuzzy
 msgid "Component name"
 msgstr "Местоположение"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "Ветка"
@@ -385,31 +333,27 @@ msgid "Please select the desired entries"
 msgstr "Язык по умолчанию"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "Сервер"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "Рабочая станция"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "Фамилия"
 
@@ -462,156 +406,6 @@ msgstr "Сетевые устройства"
 msgid "Show OPSI based clients"
 msgstr ""
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#, fuzzy
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr "Введенные пароли не совпадают!"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#, fuzzy
-msgid "Cannot determine object to change password!"
-msgstr "Сменить пароль"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "Создать терминал"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "Новая рабочая станция"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-#, fuzzy
-msgid "Unknown device"
-msgstr "состояние неизвестно"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-#, fuzzy
-msgid "New Device"
-msgstr "Сетевые устройства"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-#, fuzzy
-msgid "Terminal template for"
-msgstr "Шаблон терминала"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "Шаблон рабочей станции для"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "Шаблон"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "Телефон"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-#, fuzzy
-msgid "Network device"
-msgstr "Сетевые устройства"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "Принтер"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-#, fuzzy
-msgid "Windows workstation"
-msgstr "Показать рабочие станции"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-#, fuzzy
-msgid "Locked workstation"
-msgstr "Новая рабочая станция"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-#, fuzzy
-msgid "Locked server"
-msgstr "Сервер подкачки"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-#, fuzzy
-msgid "Locked terminal"
-msgstr "Создать терминал"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-#, fuzzy
-msgid "Workstation error"
-msgstr "Рабочая станция"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-#, fuzzy
-msgid "Server error"
-msgstr "Имя сервера"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-#, fuzzy
-msgid "Terminal error"
-msgstr "Терминал-сервер"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-#, fuzzy
-msgid "Workstation busy"
-msgstr "Рабочая станция"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-#, fuzzy
-msgid "Server busy"
-msgstr "Серверы"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-#, fuzzy
-msgid "New system from incoming"
-msgstr "Системная информация"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-#, fuzzy
-msgid "Opsi client"
-msgstr "Тонкий клиент"
-
 #: admin/systems/network.tpl:1
 #, fuzzy
 msgid "Network\tsettings"
@@ -640,7 +434,7 @@ msgstr "автоматически"
 msgid "Enable DHCP for this device"
 msgstr "Удалить параметры"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 #, fuzzy
 msgid "not configured"
 msgstr "Не настроено"
@@ -655,21 +449,21 @@ msgstr "Служба печати"
 msgid "Edit settings"
 msgstr "Почтовые настройки пользователя"
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 #, fuzzy
 msgid "Enable DNS for this device"
 msgstr "Удалить параметры"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 #, fuzzy
 msgid "Zone"
 msgstr "телефоны"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr ""
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 #, fuzzy
 msgid "Dns records"
 msgstr "Каталог"
@@ -683,12 +477,35 @@ msgstr "Список систем"
 msgid "Opsi host"
 msgstr "Тонкий клиент"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "Новая рабочая станция"
+
+#: admin/systems/system-list.xml:30
+#, fuzzy
+msgid "Locked server"
+msgstr "Сервер подкачки"
+
+#: admin/systems/system-list.xml:38
+#, fuzzy
+msgid "Locked workstation"
+msgstr "Новая рабочая станция"
+
+#: admin/systems/system-list.xml:46
+#, fuzzy
+msgid "Locked terminal"
+msgstr "Создать терминал"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "Создать терминал"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 #, fuzzy
 msgid "New unknown device"
 msgstr "состояние неизвестно"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 #, fuzzy
 msgid "New device"
 msgstr "Сетевые устройства"
@@ -708,83 +525,107 @@ msgstr "Шаблон терминала"
 msgid "Winstation"
 msgstr "Рабочая станция"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "Принтер"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "Телефон"
+
 #: admin/systems/system-list.xml:143
 #, fuzzy
 msgid "Component"
 msgstr "Прочие сетевые компоненты"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+#, fuzzy
+msgid "Release"
+msgstr "Удалить"
+
+#: admin/systems/system-list.xml:234
 #, fuzzy
 msgid "Network printer"
 msgstr "Показать сетевые принтеры"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+#, fuzzy
+msgid "Network device"
+msgstr "Сетевые устройства"
+
+#: admin/systems/system-list.xml:258
+#, fuzzy
+msgid "Opsi client"
+msgstr "Тонкий клиент"
+
+#: admin/systems/system-list.xml:270
 #, fuzzy
 msgid "Trigger action"
 msgstr "Личная информация"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr ""
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "Перезагрузить"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 #, fuzzy
 msgid "Wakeup"
 msgstr "Вернуть в обычный режим"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr ""
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 msgid "Lock"
 msgstr ""
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 #, fuzzy
 msgid "Activate"
 msgstr "Личный"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr ""
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 #, fuzzy
 msgid "Schedule action"
 msgstr "Выберите режим терминала"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr ""
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 #, fuzzy
 msgid "Activate systems"
 msgstr "Список систем"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 #, fuzzy
 msgid "Create ISO"
 msgstr "Создать"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 #, fuzzy
 msgid "Edit role"
 msgstr "Пользователи домена"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 #, fuzzy
 msgid "Remove system"
 msgstr "Удалить изображение"
@@ -825,223 +666,213 @@ msgstr "Хэширование паролей"
 msgid "Set password"
 msgstr "Изменить пароль"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 #, fuzzy
 msgid "Activated"
 msgstr "Личный"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 #, fuzzy
 msgid "server"
 msgstr "Сервер"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 #, fuzzy
 msgid "Event error"
 msgstr "Состояние системы"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "Сменить пароль"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "Выключить"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 #, fuzzy
 msgid "System update"
 msgstr "Подразделение"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 #, fuzzy
 msgid "Rescan hardware"
 msgstr "Телефонное оборудование"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 #, fuzzy
 msgid "Memory test"
 msgstr "Память"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 #, fuzzy
 msgid "System analysis"
 msgstr "Системные журналы"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "Вернуть в обычный режим"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 #, fuzzy
 msgid "Software deployment"
 msgstr "Управление системами"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "Общее"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 #, fuzzy
 msgid "Server generic"
 msgstr "Имя сервера"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 #, fuzzy
 msgid "Goto mode"
 msgstr "в папку"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 #, fuzzy
 msgid "Root password"
 msgstr "Изменить пароль"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Action flag"
 msgstr "Действие"
 
-#: admin/systems/server.tpl:26
-#, fuzzy
-msgid "Choose subtree to place server in"
-msgstr "Выберите ветку для пользователя"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-#, fuzzy
-msgid "Select a base"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "Режим"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "Выберите режим терминала"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "Действие"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 #, fuzzy
 msgid "Select action to execute for this server"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "Выполнить"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 #, fuzzy
 msgid "Not matching"
 msgstr "Показать совпадения объектов"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, fuzzy, php-format
 msgid "IP address %s"
 msgstr "IP-адрес"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 #, fuzzy
 msgid "IP address"
 msgstr "IP-адрес"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 #, fuzzy
 msgid "MAC address"
 msgstr "MAC-адрес"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "Добавить"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "Удалить"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "Добавить"
+
+#: admin/systems/class_termDNS.inc:997
 #, fuzzy
 msgid "DNS"
 msgstr "DNS"
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 #, fuzzy
 msgid "DNS settings"
 msgstr "Настройки Samba"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 #, fuzzy
 msgid "DNS configuration"
 msgstr "Базы данных"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "Базы данных"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 #, fuzzy
 msgid "component"
 msgstr "Прочие сетевые компоненты"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 #, fuzzy
 msgid "Component generic"
 msgstr "Прочие сетевые компоненты"
@@ -1051,10 +882,73 @@ msgstr "Прочие сетевые компоненты"
 msgid "Device name"
 msgstr "Имя сервера"
 
-#: admin/systems/component.tpl:20
 #, fuzzy
-msgid "Choose subtree to place component in"
-msgstr "Выберите ветку для группы"
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr "Введенные пароли не совпадают!"
+
+#, fuzzy
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "Сменить пароль"
+
+#, fuzzy
+#~ msgid "Unknown device"
+#~ msgstr "состояние неизвестно"
+
+#, fuzzy
+#~ msgid "New Device"
+#~ msgstr "Сетевые устройства"
+
+#, fuzzy
+#~ msgid "Terminal template for"
+#~ msgstr "Шаблон терминала"
+
+#~ msgid "Workstation template for"
+#~ msgstr "Шаблон рабочей станции для"
+
+#~ msgid "Template"
+#~ msgstr "Шаблон"
+
+#, fuzzy
+#~ msgid "Windows workstation"
+#~ msgstr "Показать рабочие станции"
+
+#, fuzzy
+#~ msgid "Workstation error"
+#~ msgstr "Рабочая станция"
+
+#, fuzzy
+#~ msgid "Server error"
+#~ msgstr "Имя сервера"
+
+#, fuzzy
+#~ msgid "Terminal error"
+#~ msgstr "Терминал-сервер"
+
+#, fuzzy
+#~ msgid "Workstation busy"
+#~ msgstr "Рабочая станция"
+
+#, fuzzy
+#~ msgid "Server busy"
+#~ msgstr "Серверы"
+
+#, fuzzy
+#~ msgid "New system from incoming"
+#~ msgstr "Системная информация"
+
+#, fuzzy
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "Выберите ветку для пользователя"
+
+#, fuzzy
+#~ msgid "Select a base"
+#~ msgstr "Выберите, чтобы просмотреть серверы"
+
+#, fuzzy
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "Выберите ветку для группы"
 
 #, fuzzy
 #~ msgid "Select all"
@@ -1064,10 +958,6 @@ msgstr "Выберите ветку для группы"
 #~ msgid "Department"
 #~ msgstr "Подразделение"
 
-#, fuzzy
-#~ msgid "Release"
-#~ msgstr "Удалить"
-
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "Сервер"
@@ -1162,10 +1052,6 @@ msgstr "Выберите ветку для группы"
 #~ msgid "Create FAI CD"
 #~ msgstr "Объект группы"
 
-#, fuzzy
-#~ msgid "Inherited from %s"
-#~ msgstr "Объединения"
-
 #, fuzzy
 #~ msgid "Number of listed '%s'"
 #~ msgstr "Подразделение"
diff --git a/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po
index 6cb399540..2337cc8b2 100644
--- a/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/systems/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-01 14:51+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,181 +39,128 @@ msgstr "所以，如果您确定，请按“删除”继续，否则按“取消
 msgid "Systems"
 msgstr "系统设置"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.tmp:965
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
-#: admin/systems/.svn/tmp/tempfile.2.tmp:969
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: admin/systems/class_systemManagement.inc:171
-#: admin/systems/class_systemManagement.inc:267
-#: admin/systems/.svn/tmp/tempfile.tmp:633
-#: admin/systems/.svn/tmp/tempfile.tmp:736
-#: admin/systems/.svn/tmp/tempfile.2.tmp:637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:740
+#: admin/systems/class_systemManagement.inc:172
+#: admin/systems/class_systemManagement.inc:268
 #, fuzzy
 msgid "You have no permission to change this password!"
 msgstr "现在您无权修改您的口令"
 
-#: admin/systems/class_systemManagement.inc:258
-#: admin/systems/class_systemManagement.inc:677
-#: admin/systems/class_systemManagement.inc:683
-#: admin/systems/class_systemManagement.inc:802
-#: admin/systems/class_systemManagement.inc:817
+#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:680
+#: admin/systems/class_systemManagement.inc:686
+#: admin/systems/class_systemManagement.inc:805
+#: admin/systems/class_systemManagement.inc:820
 #: admin/systems/class_serverService.inc:196
-#: admin/systems/class_serverService.inc:239
-#: admin/systems/class_serverService.inc:452
-#: admin/systems/.svn/tmp/tempfile.tmp:365
-#: admin/systems/.svn/tmp/tempfile.tmp:480
-#: admin/systems/.svn/tmp/tempfile.tmp:517
-#: admin/systems/.svn/tmp/tempfile.tmp:525
-#: admin/systems/.svn/tmp/tempfile.tmp:575
-#: admin/systems/.svn/tmp/tempfile.tmp:583
-#: admin/systems/.svn/tmp/tempfile.tmp:598
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.tmp:1301
-#: admin/systems/.svn/tmp/tempfile.2.tmp:369
-#: admin/systems/.svn/tmp/tempfile.2.tmp:484
-#: admin/systems/.svn/tmp/tempfile.2.tmp:521
-#: admin/systems/.svn/tmp/tempfile.2.tmp:529
-#: admin/systems/.svn/tmp/tempfile.2.tmp:579
-#: admin/systems/.svn/tmp/tempfile.2.tmp:587
-#: admin/systems/.svn/tmp/tempfile.2.tmp:602
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1305
-#: admin/systems/class_filterSYSTEMS.inc:127
-#: admin/systems/class_termDNS.inc:343
+#: admin/systems/class_serverService.inc:238
+#: admin/systems/class_serverService.inc:450
+#: admin/systems/class_servGeneric.inc:296
+#: admin/systems/class_filterSYSTEMS.inc:131
+#: admin/systems/class_termDNS.inc:345
+#: admin/systems/class_componentGeneric.inc:166
 msgid "Error"
 msgstr "错误"
 
-#: admin/systems/class_systemManagement.inc:259
+#: admin/systems/class_systemManagement.inc:260
 #, fuzzy
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated password' do "
 "not   match!"
 msgstr "输入的新口令和重复口令不匹配！"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 #, fuzzy
 msgid "Password method"
 msgstr "口令存储"
 
-#: admin/systems/class_systemManagement.inc:305
-#: admin/systems/.svn/tmp/tempfile.tmp:720
-#: admin/systems/.svn/tmp/tempfile.2.tmp:724
+#: admin/systems/class_systemManagement.inc:306
 msgid "Password method crypt is missing. Cannot set system password."
 msgstr ""
 
-#: admin/systems/class_systemManagement.inc:311
-#: admin/systems/class_systemManagement.inc:1053
+#: admin/systems/class_systemManagement.inc:312
+#: admin/systems/class_systemManagement.inc:1056
 #: admin/systems/services/class_goService.inc:122
 #: admin/systems/services/class_goService.inc:150
 #: admin/systems/services/class_goService.inc:183
-#: admin/systems/.svn/tmp/tempfile.tmp:726
-#: admin/systems/.svn/tmp/tempfile.tmp:1833
-#: admin/systems/.svn/tmp/tempfile.2.tmp:730
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1837
-#: admin/systems/class_servGeneric.inc:283
-#: admin/systems/class_servGeneric.inc:435 admin/systems/class_termDNS.inc:488
-#: admin/systems/class_termDNS.inc:794 admin/systems/class_termDNS.inc:813
-#: admin/systems/class_termDNS.inc:834 admin/systems/class_termDNS.inc:839
-#: admin/systems/class_termDNS.inc:857 admin/systems/class_termDNS.inc:933
-#: admin/systems/class_componentGeneric.inc:160
-#: admin/systems/class_componentGeneric.inc:301
+#: admin/systems/class_servGeneric.inc:262
+#: admin/systems/class_servGeneric.inc:421 admin/systems/class_termDNS.inc:490
+#: admin/systems/class_termDNS.inc:796 admin/systems/class_termDNS.inc:815
+#: admin/systems/class_termDNS.inc:836 admin/systems/class_termDNS.inc:841
+#: admin/systems/class_termDNS.inc:859 admin/systems/class_termDNS.inc:935
+#: admin/systems/class_componentGeneric.inc:134
+#: admin/systems/class_componentGeneric.inc:284
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: admin/systems/class_systemManagement.inc:360
-#: admin/systems/.svn/tmp/tempfile.tmp:239
-#: admin/systems/.svn/tmp/tempfile.2.tmp:239
+#: admin/systems/class_systemManagement.inc:361
 msgid "Back"
 msgstr "返回"
 
-#: admin/systems/class_systemManagement.inc:406
-#: admin/systems/.svn/tmp/tempfile.tmp:286
-#: admin/systems/.svn/tmp/tempfile.2.tmp:286
+#: admin/systems/class_systemManagement.inc:407
 msgid "Creating the image failed. Please see the report below."
 msgstr "创建图片错误。请检查下面的报告。"
 
-#: admin/systems/class_systemManagement.inc:411
-#: admin/systems/.svn/tmp/tempfile.tmp:295
-#: admin/systems/.svn/tmp/tempfile.2.tmp:295
+#: admin/systems/class_systemManagement.inc:412
 #, php-format
 msgid "Command '%s', specified for ISO creation doesn't seem to exist."
 msgstr "命令 '%s'，用于创建 ISO 好像并不存在。"
 
-#: admin/systems/class_systemManagement.inc:503
-#: admin/systems/class_systemManagement.inc:532
-#: admin/systems/.svn/tmp/tempfile.tmp:846
-#: admin/systems/.svn/tmp/tempfile.2.tmp:850
-#: admin/systems/class_servGeneric.inc:167
-#: admin/systems/class_servGeneric.inc:455
+#: admin/systems/class_systemManagement.inc:504
+#: admin/systems/class_systemManagement.inc:534
+#: admin/systems/class_servGeneric.inc:176
+#: admin/systems/class_servGeneric.inc:441
 #, fuzzy
 msgid "Service infrastructure"
 msgstr "设备名称"
 
-#: admin/systems/class_systemManagement.inc:578
-#: admin/systems/class_systemManagement.inc:654
-#: admin/systems/class_systemManagement.inc:1098
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
-#: admin/systems/.svn/tmp/tempfile.tmp:891
-#: admin/systems/.svn/tmp/tempfile.2.tmp:895
+#: admin/systems/class_systemManagement.inc:581
+#: admin/systems/class_systemManagement.inc:657
+#: admin/systems/class_systemManagement.inc:1101
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Internal error"
 msgstr "终端服务器"
 
-#: admin/systems/class_systemManagement.inc:869
-#: admin/systems/.svn/tmp/tempfile.tmp:420
-#: admin/systems/.svn/tmp/tempfile.2.tmp:424
+#: admin/systems/class_systemManagement.inc:872
 #, fuzzy
 msgid "Cannot set mode to 'active'!"
 msgstr "转到根部门"
 
-#: admin/systems/class_systemManagement.inc:1098
+#: admin/systems/class_systemManagement.inc:1101
 #, fuzzy, php-format
 msgid "You are not allowed to create a snapshot for %s."
 msgstr "您无权删除这个用户！"
 
-#: admin/systems/class_systemManagement.inc:1145
-#: admin/systems/class_systemManagement.inc:1166
+#: admin/systems/class_systemManagement.inc:1148
+#: admin/systems/class_systemManagement.inc:1169
 #, fuzzy, php-format
 msgid "You are not allowed to restore a snapshot for %s."
 msgstr "您无权删除这个用户！"
 
-#: admin/systems/class_systemManagement.inc:1352
-#: admin/systems/class_systemManagement.inc:1353
-#: admin/systems/.svn/tmp/tempfile.tmp:1849
-#: admin/systems/.svn/tmp/tempfile.tmp:1850
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1853
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1854
+#: admin/systems/class_systemManagement.inc:1377
+#, fuzzy, php-format
+msgid "Inherited from %s"
+msgstr "对象组"
+
+#: admin/systems/class_systemManagement.inc:1393
+#: admin/systems/class_systemManagement.inc:1394
 #, fuzzy
 msgid "Incoming objects"
 msgstr "成员对象"
 
-#: admin/systems/class_systemManagement.inc:1358
-#: admin/systems/.svn/tmp/tempfile.tmp:1855
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1859
+#: admin/systems/class_systemManagement.inc:1399
 #, fuzzy
 msgid "Incoming"
 msgstr "图标"
@@ -269,21 +217,21 @@ msgstr ""
 
 #: admin/systems/serverService-list.xml:35
 #: admin/systems/systemSelect/selectSystem-list.xml:65
-#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:515
-#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:320
-#: admin/systems/component.tpl:35
+#: admin/systems/system-list.xml:177 admin/systems/class_servGeneric.inc:501
+#: admin/systems/server.tpl:14 admin/systems/class_componentGeneric.inc:303
+#: admin/systems/component.tpl:29
 msgid "Description"
 msgstr "描述"
 
-#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:185
+#: admin/systems/serverService-list.xml:43 admin/systems/system-list.xml:193
 msgid "Actions"
 msgstr "动作"
 
-#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:196
+#: admin/systems/serverService-list.xml:54 admin/systems/system-list.xml:204
 msgid "Create"
 msgstr "创建"
 
-#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:404
+#: admin/systems/serverService-list.xml:72 admin/systems/system-list.xml:412
 msgid "Remove"
 msgstr "删除"
 
@@ -317,32 +265,32 @@ msgstr "打印服务"
 msgid "Remove service"
 msgstr "删除 DNS 服务"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 #, fuzzy
 msgid "Filter error"
 msgstr "终端服务器"
 
-#: admin/systems/class_serverService.inc:298
+#: admin/systems/class_serverService.inc:297
 msgid "The filter is incomplete!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 #, fuzzy
 msgid "Information"
 msgstr "工作站"
 
-#: admin/systems/class_serverService.inc:440
+#: admin/systems/class_serverService.inc:438
 msgid "Cannot update service status until it has been saved!"
 msgstr ""
 
-#: admin/systems/class_serverService.inc:452
+#: admin/systems/class_serverService.inc:450
 #, fuzzy
 msgid "Cannot update service status!"
 msgstr "无法打开指定证书！"
 
-#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:341
-#: admin/systems/class_servGeneric.inc:346
-#: admin/systems/class_servGeneric.inc:357 admin/systems/server.tpl:6
+#: admin/systems/paste_generic.tpl:4 admin/systems/class_servGeneric.inc:322
+#: admin/systems/class_servGeneric.inc:327
+#: admin/systems/class_servGeneric.inc:343 admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "服务器名称"
 
@@ -360,16 +308,16 @@ msgid "Printer name"
 msgstr "打印机名称"
 
 #: admin/systems/paste_generic.tpl:44
-#: admin/systems/class_componentGeneric.inc:209
+#: admin/systems/class_componentGeneric.inc:187
+#: admin/systems/class_componentGeneric.inc:192
 #: admin/systems/class_componentGeneric.inc:214
-#: admin/systems/class_componentGeneric.inc:236
 #, fuzzy
 msgid "Component name"
 msgstr "常用名"
 
 #: admin/systems/systemSelect/selectSystem-list.tpl:13
-#: admin/systems/class_servGeneric.inc:516 admin/systems/system-list.tpl:13
-#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:319
+#: admin/systems/class_servGeneric.inc:502 admin/systems/system-list.tpl:13
+#: admin/systems/server.tpl:22 admin/systems/class_componentGeneric.inc:302
 #: admin/systems/component.tpl:17
 msgid "Base"
 msgstr "位置"
@@ -380,30 +328,26 @@ msgid "Please select the desired entries"
 msgstr "请选择一个打印机或者取消。"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:15
-#: admin/systems/.svn/tmp/tempfile.tmp:1629
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1633
-#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:202
-#: admin/systems/class_servGeneric.inc:511
+#: admin/systems/system-list.xml:103 admin/systems/system-list.xml:210
+#: admin/systems/class_servGeneric.inc:497
 msgid "Server"
 msgstr "服务器"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:23
-#: admin/systems/.svn/tmp/tempfile.tmp:1628
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1632
-#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:210
+#: admin/systems/system-list.xml:111 admin/systems/system-list.xml:218
 msgid "Workstation"
 msgstr "工作站"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:31
-#: admin/systems/.svn/tmp/tempfile.tmp:1630
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1634
-#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:218
+#: admin/systems/system-list.xml:119 admin/systems/system-list.xml:226
 msgid "Terminal"
 msgstr "终端"
 
 #: admin/systems/systemSelect/selectSystem-list.xml:57
-#: admin/systems/system-list.xml:169 admin/systems/class_servGeneric.inc:514
-#: admin/systems/class_componentGeneric.inc:318
+#: admin/systems/systemSelect/selectSystem-filter.tpl:22
+#: admin/systems/system-filter.tpl:46 admin/systems/system-list.xml:169
+#: admin/systems/class_servGeneric.inc:500
+#: admin/systems/class_componentGeneric.inc:301
 msgid "Name"
 msgstr "名称"
 
@@ -455,154 +399,6 @@ msgstr "显示网络设备"
 msgid "Show OPSI based clients"
 msgstr ""
 
-#: admin/systems/.svn/tmp/tempfile.tmp:606
-#: admin/systems/.svn/tmp/tempfile.2.tmp:610
-msgid "Editing this type of object is not supported yet!"
-msgstr ""
-
-#: admin/systems/.svn/tmp/tempfile.tmp:645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:649
-#, fuzzy
-msgid ""
-"The passwords you've entered as 'New password' and 'Repeated password' do "
-"not match!"
-msgstr "输入的新口令和重复口令不匹配！"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:739
-#: admin/systems/.svn/tmp/tempfile.2.tmp:743
-#, fuzzy
-msgid "Cannot determine object to change password!"
-msgstr "无法检测对象名称。"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1330
-#: admin/systems/.svn/tmp/tempfile.tmp:1644
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1648 admin/systems/system-list.xml:55
-#: admin/systems/class_filterSYSTEMS.inc:23
-msgid "New terminal"
-msgstr "新终端"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1332
-#: admin/systems/.svn/tmp/tempfile.tmp:1645
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1649 admin/systems/system-list.xml:22
-#: admin/systems/class_filterSYSTEMS.inc:20
-msgid "New workstation"
-msgstr "新工作站"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1334
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1338
-#, fuzzy
-msgid "Unknown device"
-msgstr "未知"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1336
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1340
-msgid "New Device"
-msgstr "新设备"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1361
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1365
-msgid "Terminal template for"
-msgstr "终端模板"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1377
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1381
-msgid "Workstation template for"
-msgstr "工作站模板"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1621
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1625
-msgid "Template"
-msgstr "模板"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1622
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1626
-#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:234
-msgid "Phone"
-msgstr "电话"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1623
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1627
-#: admin/systems/system-list.xml:242
-#: admin/systems/class_componentGeneric.inc:315
-#, fuzzy
-msgid "Network device"
-msgstr "网络设备"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1624
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1628
-#: admin/systems/system-list.xml:127
-msgid "Printer"
-msgstr "打印机"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1626
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1630
-#, fuzzy
-msgid "Windows workstation"
-msgstr "显示工作站"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1632
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1636 admin/systems/system-list.xml:38
-#, fuzzy
-msgid "Locked workstation"
-msgstr "新工作站"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1633
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1637 admin/systems/system-list.xml:30
-#, fuzzy
-msgid "Locked server"
-msgstr "LDAP 服务器"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1634
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1638 admin/systems/system-list.xml:46
-#, fuzzy
-msgid "Locked terminal"
-msgstr "新终端"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1636
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1640
-#, fuzzy
-msgid "Workstation error"
-msgstr "工作站"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1637
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1641
-#, fuzzy
-msgid "Server error"
-msgstr "服务器名称"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1638
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1642
-#, fuzzy
-msgid "Terminal error"
-msgstr "终端服务器"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1640
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1644
-#, fuzzy
-msgid "Workstation busy"
-msgstr "工作站"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1641
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1645
-#, fuzzy
-msgid "Server busy"
-msgstr "服务器"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1643
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1647
-#, fuzzy
-msgid "New system from incoming"
-msgstr "新识别的系统"
-
-#: admin/systems/.svn/tmp/tempfile.tmp:1649
-#: admin/systems/.svn/tmp/tempfile.2.tmp:1653
-#: admin/systems/system-list.xml:250
-#, fuzzy
-msgid "Opsi client"
-msgstr "瘦客户机"
-
 #: admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "网络\t设置"
@@ -629,7 +425,7 @@ msgstr "自动检测"
 msgid "Enable DHCP for this device"
 msgstr "启用该设备 DNS"
 
-#: admin/systems/network.tpl:72 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:72 admin/systems/network.tpl:167
 #, fuzzy
 msgid "not configured"
 msgstr "未配置"
@@ -644,19 +440,19 @@ msgstr "Parent 服务器"
 msgid "Edit settings"
 msgstr "编辑设置..."
 
-#: admin/systems/network.tpl:135 admin/systems/network.tpl:175
+#: admin/systems/network.tpl:129 admin/systems/network.tpl:167
 msgid "Enable DNS for this device"
 msgstr "启用该设备 DNS"
 
-#: admin/systems/network.tpl:144
+#: admin/systems/network.tpl:138
 msgid "Zone"
 msgstr "Zone"
 
-#: admin/systems/network.tpl:154
+#: admin/systems/network.tpl:148
 msgid "TTL"
 msgstr "TTL"
 
-#: admin/systems/network.tpl:162
+#: admin/systems/network.tpl:156
 msgid "Dns records"
 msgstr "Dns 记录"
 
@@ -669,12 +465,35 @@ msgstr "系统列表"
 msgid "Opsi host"
 msgstr "瘦客户机"
 
-#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:28
+#: admin/systems/system-list.xml:22 admin/systems/class_filterSYSTEMS.inc:24
+msgid "New workstation"
+msgstr "新工作站"
+
+#: admin/systems/system-list.xml:30
+#, fuzzy
+msgid "Locked server"
+msgstr "LDAP 服务器"
+
+#: admin/systems/system-list.xml:38
+#, fuzzy
+msgid "Locked workstation"
+msgstr "新工作站"
+
+#: admin/systems/system-list.xml:46
+#, fuzzy
+msgid "Locked terminal"
+msgstr "新终端"
+
+#: admin/systems/system-list.xml:55 admin/systems/class_filterSYSTEMS.inc:27
+msgid "New terminal"
+msgstr "新终端"
+
+#: admin/systems/system-list.xml:63 admin/systems/class_filterSYSTEMS.inc:32
 #, fuzzy
 msgid "New unknown device"
 msgstr "未知"
 
-#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:31
+#: admin/systems/system-list.xml:71 admin/systems/class_filterSYSTEMS.inc:35
 #, fuzzy
 msgid "New device"
 msgstr "新设备"
@@ -693,84 +512,108 @@ msgstr "终端模板"
 msgid "Winstation"
 msgstr "Windows 工作站"
 
+#: admin/systems/system-list.xml:127
+msgid "Printer"
+msgstr "打印机"
+
+#: admin/systems/system-list.xml:135 admin/systems/system-list.xml:242
+msgid "Phone"
+msgstr "电话"
+
 #: admin/systems/system-list.xml:143
 #, fuzzy
 msgid "Component"
 msgstr "新组件"
 
-#: admin/systems/system-list.xml:226
+#: admin/systems/system-list.xml:185
+#, fuzzy
+msgid "Release"
+msgstr "删除"
+
+#: admin/systems/system-list.xml:234
 #, fuzzy
 msgid "Network printer"
 msgstr "显示网络打印机"
 
-#: admin/systems/system-list.xml:262
+#: admin/systems/system-list.xml:250
+#: admin/systems/class_componentGeneric.inc:298
+#, fuzzy
+msgid "Network device"
+msgstr "网络设备"
+
+#: admin/systems/system-list.xml:258
+#, fuzzy
+msgid "Opsi client"
+msgstr "瘦客户机"
+
+#: admin/systems/system-list.xml:270
 #, fuzzy
 msgid "Trigger action"
 msgstr "切换信息"
 
-#: admin/systems/system-list.xml:269
+#: admin/systems/system-list.xml:277
 msgid "Halt "
 msgstr ""
 
-#: admin/systems/system-list.xml:277 admin/systems/system-list.xml:343
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/class_servGeneric.inc:206
 msgid "Reboot"
 msgstr "重启"
 
-#: admin/systems/system-list.xml:285 admin/systems/system-list.xml:351
+#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
 #, fuzzy
 msgid "Wakeup"
 msgstr "唤醒"
 
-#: admin/systems/system-list.xml:293 admin/systems/system-list.xml:359
+#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
 msgid "Update"
 msgstr ""
 
-#: admin/systems/system-list.xml:301 admin/systems/system-list.xml:367
+#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
 #, fuzzy
 msgid "Lock"
 msgstr "锁定"
 
-#: admin/systems/system-list.xml:309 admin/systems/system-list.xml:375
+#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
 #, fuzzy
 msgid "Activate"
 msgstr "活动"
 
-#: admin/systems/system-list.xml:317 admin/systems/system-list.xml:383
-#: admin/systems/class_servGeneric.inc:229
-#: admin/systems/class_servGeneric.inc:236
+#: admin/systems/system-list.xml:325 admin/systems/system-list.xml:391
+#: admin/systems/class_servGeneric.inc:208
+#: admin/systems/class_servGeneric.inc:215
 msgid "Reinstall"
 msgstr "重新安装"
 
-#: admin/systems/system-list.xml:328
+#: admin/systems/system-list.xml:336
 #, fuzzy
 msgid "Schedule action"
 msgstr "计划更新"
 
-#: admin/systems/system-list.xml:335
+#: admin/systems/system-list.xml:343
 msgid "Halt"
 msgstr ""
 
-#: admin/systems/system-list.xml:397
+#: admin/systems/system-list.xml:405
 #, fuzzy
 msgid "Activate systems"
 msgstr "编辑系统"
 
-#: admin/systems/system-list.xml:432
+#: admin/systems/system-list.xml:440
 msgid "Change password"
 msgstr "修改口令"
 
-#: admin/systems/system-list.xml:443
+#: admin/systems/system-list.xml:451
 #, fuzzy
 msgid "Create ISO"
 msgstr "创建"
 
-#: admin/systems/system-list.xml:455
+#: admin/systems/system-list.xml:463
 #, fuzzy
 msgid "Edit role"
 msgstr "编辑宏"
 
-#: admin/systems/system-list.xml:468
+#: admin/systems/system-list.xml:476
 #, fuzzy
 msgid "Remove system"
 msgstr "删除图片"
@@ -809,214 +652,205 @@ msgstr "口令存储"
 msgid "Set password"
 msgstr "设置口令"
 
-#: admin/systems/class_servGeneric.inc:82
+#: admin/systems/class_servGeneric.inc:83
 msgid "Activated"
 msgstr "活动"
 
-#: admin/systems/class_servGeneric.inc:83
+#: admin/systems/class_servGeneric.inc:84
 msgid "Locked"
 msgstr "锁定"
 
-#: admin/systems/class_servGeneric.inc:150
+#: admin/systems/class_servGeneric.inc:159
 #, fuzzy
 msgid "server"
 msgstr "服务器"
 
-#: admin/systems/class_servGeneric.inc:171
+#: admin/systems/class_servGeneric.inc:180
 #, fuzzy
 msgid "Event error"
 msgstr "PHP 错误"
 
-#: admin/systems/class_servGeneric.inc:172
+#: admin/systems/class_servGeneric.inc:181
 #, fuzzy, php-format
 msgid "Event '%s' is not available!"
 msgstr "不允许修改口令"
 
-#: admin/systems/class_servGeneric.inc:227
+#: admin/systems/class_servGeneric.inc:206
 msgid "Switch off"
 msgstr "关闭"
 
-#: admin/systems/class_servGeneric.inc:228
-#: admin/systems/class_servGeneric.inc:237
+#: admin/systems/class_servGeneric.inc:207
+#: admin/systems/class_servGeneric.inc:216
 #, fuzzy
 msgid "System update"
 msgstr "系统 / 部门"
 
-#: admin/systems/class_servGeneric.inc:230
+#: admin/systems/class_servGeneric.inc:209
 msgid "Rescan hardware"
 msgstr "重新扫描硬件"
 
-#: admin/systems/class_servGeneric.inc:231
-#: admin/systems/class_servGeneric.inc:238
+#: admin/systems/class_servGeneric.inc:210
+#: admin/systems/class_servGeneric.inc:217
 msgid "Memory test"
 msgstr "内存测试"
 
-#: admin/systems/class_servGeneric.inc:232
-#: admin/systems/class_servGeneric.inc:239
+#: admin/systems/class_servGeneric.inc:211
+#: admin/systems/class_servGeneric.inc:218
 msgid "Force localboot"
 msgstr "强制本地启动"
 
-#: admin/systems/class_servGeneric.inc:233
-#: admin/systems/class_servGeneric.inc:240
+#: admin/systems/class_servGeneric.inc:212
+#: admin/systems/class_servGeneric.inc:219
 msgid "System analysis"
 msgstr "系统分析"
 
-#: admin/systems/class_servGeneric.inc:235
+#: admin/systems/class_servGeneric.inc:214
 msgid "Wake up"
 msgstr "唤醒"
 
-#: admin/systems/class_servGeneric.inc:371
+#: admin/systems/class_servGeneric.inc:357
 #, fuzzy
 msgid "Software deployment"
 msgstr "系统管理"
 
-#: admin/systems/class_servGeneric.inc:372
+#: admin/systems/class_servGeneric.inc:358
 msgid ""
 "This host is currently installing, if you really want to save it, press 'OK'."
 msgstr ""
 
-#: admin/systems/class_servGeneric.inc:505
-#: admin/systems/class_componentGeneric.inc:309
+#: admin/systems/class_servGeneric.inc:491
+#: admin/systems/class_componentGeneric.inc:292
 msgid "Generic"
 msgstr "通用配置"
 
-#: admin/systems/class_servGeneric.inc:506
+#: admin/systems/class_servGeneric.inc:492
 #, fuzzy
 msgid "Server generic"
 msgstr "服务器名称"
 
-#: admin/systems/class_servGeneric.inc:518
+#: admin/systems/class_servGeneric.inc:504
 #, fuzzy
 msgid "Goto mode"
 msgstr "到目录"
 
-#: admin/systems/class_servGeneric.inc:519
-#: admin/systems/class_componentGeneric.inc:321
+#: admin/systems/class_servGeneric.inc:505
+#: admin/systems/class_componentGeneric.inc:304
 #, fuzzy
 msgid "Root password"
 msgstr "设置口令"
 
-#: admin/systems/class_servGeneric.inc:520
+#: admin/systems/class_servGeneric.inc:506
 #, fuzzy
 msgid "Action flag"
 msgstr "行动"
 
-#: admin/systems/server.tpl:26
-#, fuzzy
-msgid "Choose subtree to place server in"
-msgstr "将用户放到所选择子树中"
-
-#: admin/systems/server.tpl:32 admin/systems/component.tpl:25
-msgid "Select a base"
-msgstr "选择一个位置"
-
-#: admin/systems/server.tpl:42
+#: admin/systems/server.tpl:36
 msgid "Mode"
 msgstr "模式"
 
-#: admin/systems/server.tpl:45
+#: admin/systems/server.tpl:39
 msgid "Select terminal mode"
 msgstr "选择终端类型"
 
-#: admin/systems/server.tpl:63
+#: admin/systems/server.tpl:57
 msgid "Action"
 msgstr "行动"
 
-#: admin/systems/server.tpl:69
+#: admin/systems/server.tpl:63
 msgid ""
 "System installation in progress, the FAI state cannot be changed right now."
 msgstr ""
 
-#: admin/systems/server.tpl:72
+#: admin/systems/server.tpl:66
 msgid "Select action to execute for this server"
 msgstr "选择为这台服务器要执行的动作"
 
-#: admin/systems/server.tpl:80
+#: admin/systems/server.tpl:74
 msgid "Execute"
 msgstr "执行"
 
-#: admin/systems/class_termDNS.inc:449
+#: admin/systems/class_termDNS.inc:451
 msgid "Not matching"
 msgstr "不匹配"
 
-#: admin/systems/class_termDNS.inc:602
+#: admin/systems/class_termDNS.inc:604
 #, fuzzy, php-format
 msgid "IP address %s"
 msgstr "IP 地址"
 
-#: admin/systems/class_termDNS.inc:611 admin/systems/class_termDNS.inc:623
-#: admin/systems/class_termDNS.inc:625 admin/systems/class_termDNS.inc:1010
-#: admin/systems/class_componentGeneric.inc:219
-#: admin/systems/class_componentGeneric.inc:222
+#: admin/systems/class_termDNS.inc:613 admin/systems/class_termDNS.inc:625
+#: admin/systems/class_termDNS.inc:627 admin/systems/class_termDNS.inc:1006
+#: admin/systems/class_componentGeneric.inc:197
+#: admin/systems/class_componentGeneric.inc:200
 #, fuzzy
 msgid "IP address"
 msgstr "IP 地址"
 
-#: admin/systems/class_termDNS.inc:616 admin/systems/class_termDNS.inc:633
-#: admin/systems/class_termDNS.inc:635 admin/systems/class_termDNS.inc:1011
+#: admin/systems/class_termDNS.inc:618 admin/systems/class_termDNS.inc:635
+#: admin/systems/class_termDNS.inc:637 admin/systems/class_termDNS.inc:1007
 msgid "MAC address"
 msgstr "MAC 地址"
 
-#: admin/systems/class_termDNS.inc:650
+#: admin/systems/class_termDNS.inc:652
 #, fuzzy, php-format
 msgid "The IP address '%s' is not part of the selected reverse zone '%s'!"
 msgstr "提供的 IP 地址 '%s' 和所选的反向解析域条目 '%s' 不匹配。"
 
-#: admin/systems/class_termDNS.inc:662
+#: admin/systems/class_termDNS.inc:664
 #, php-format
 msgid "Record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:670
+#: admin/systems/class_termDNS.inc:672
 #, php-format
 msgid "Uniq record type '%s' is duplicated!"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:682
+#: admin/systems/class_termDNS.inc:684
 #, fuzzy, php-format
 msgid ""
 "The IP address '%s' will be added as 'A Record', this will be done "
 "automatically, please remove the record."
 msgstr "设备 IP '%s' 将自动作为'A'记录添加，请删除这条记录。"
 
-#: admin/systems/class_termDNS.inc:690
+#: admin/systems/class_termDNS.inc:692
 #, fuzzy, php-format
 msgid "Only lowercase records are allowed, please check your '%ss'."
 msgstr "只允许小写字母，请检查您的 '%ss'。"
 
-#: admin/systems/class_termDNS.inc:950 admin/systems/class_termDNS.inc:970
-msgid "Add"
-msgstr "添加"
-
-#: admin/systems/class_termDNS.inc:964
+#: admin/systems/class_termDNS.inc:960
 msgid "Delete"
 msgstr "删除"
 
-#: admin/systems/class_termDNS.inc:1001
+#: admin/systems/class_termDNS.inc:966
+msgid "Add"
+msgstr "添加"
+
+#: admin/systems/class_termDNS.inc:997
 msgid "DNS"
 msgstr ""
 
-#: admin/systems/class_termDNS.inc:1002
+#: admin/systems/class_termDNS.inc:998
 #, fuzzy
 msgid "DNS settings"
 msgstr "Samba 设置"
 
-#: admin/systems/class_termDNS.inc:1017
+#: admin/systems/class_termDNS.inc:1013
 #, fuzzy
 msgid "DNS configuration"
 msgstr "PHP 安装检查"
 
-#: admin/systems/class_termDNS.inc:1020
+#: admin/systems/class_termDNS.inc:1016
 #, fuzzy
 msgid "DHCP configuration"
 msgstr "PHP 安装检查"
 
-#: admin/systems/class_componentGeneric.inc:77
+#: admin/systems/class_componentGeneric.inc:84
 #, fuzzy
 msgid "component"
 msgstr "新组件"
 
-#: admin/systems/class_componentGeneric.inc:310
+#: admin/systems/class_componentGeneric.inc:293
 #, fuzzy
 msgid "Component generic"
 msgstr "新组件"
@@ -1025,10 +859,70 @@ msgstr "新组件"
 msgid "Device name"
 msgstr "设备名称"
 
-#: admin/systems/component.tpl:20
 #, fuzzy
-msgid "Choose subtree to place component in"
-msgstr "选择来放置组的子树"
+#~ msgid ""
+#~ "The passwords you've entered as 'New password' and 'Repeated password' do "
+#~ "not match!"
+#~ msgstr "输入的新口令和重复口令不匹配！"
+
+#, fuzzy
+#~ msgid "Cannot determine object to change password!"
+#~ msgstr "无法检测对象名称。"
+
+#, fuzzy
+#~ msgid "Unknown device"
+#~ msgstr "未知"
+
+#~ msgid "New Device"
+#~ msgstr "新设备"
+
+#~ msgid "Terminal template for"
+#~ msgstr "终端模板"
+
+#~ msgid "Workstation template for"
+#~ msgstr "工作站模板"
+
+#~ msgid "Template"
+#~ msgstr "模板"
+
+#, fuzzy
+#~ msgid "Windows workstation"
+#~ msgstr "显示工作站"
+
+#, fuzzy
+#~ msgid "Workstation error"
+#~ msgstr "工作站"
+
+#, fuzzy
+#~ msgid "Server error"
+#~ msgstr "服务器名称"
+
+#, fuzzy
+#~ msgid "Terminal error"
+#~ msgstr "终端服务器"
+
+#, fuzzy
+#~ msgid "Workstation busy"
+#~ msgstr "工作站"
+
+#, fuzzy
+#~ msgid "Server busy"
+#~ msgstr "服务器"
+
+#, fuzzy
+#~ msgid "New system from incoming"
+#~ msgstr "新识别的系统"
+
+#, fuzzy
+#~ msgid "Choose subtree to place server in"
+#~ msgstr "将用户放到所选择子树中"
+
+#~ msgid "Select a base"
+#~ msgstr "选择一个位置"
+
+#, fuzzy
+#~ msgid "Choose subtree to place component in"
+#~ msgstr "选择来放置组的子树"
 
 #~ msgid "Submit"
 #~ msgstr "提交"
@@ -1041,10 +935,6 @@ msgstr "选择来放置组的子树"
 #~ msgid "Department"
 #~ msgstr "系统 / 部门"
 
-#, fuzzy
-#~ msgid "Release"
-#~ msgstr "删除"
-
 #, fuzzy
 #~ msgid "servers"
 #~ msgstr "服务器"
@@ -1131,10 +1021,6 @@ msgstr "选择来放置组的子树"
 #~ msgid "Create FAI CD"
 #~ msgstr "创建 FAI CD"
 
-#, fuzzy
-#~ msgid "Inherited from %s"
-#~ msgstr "对象组"
-
 #, fuzzy
 #~ msgid "Number of listed '%s'"
 #~ msgstr "部门名称"
diff --git a/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po
index f94f74436..754c942fe 100644
--- a/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/de/LC_MESSAGES/messages.po
@@ -13,10 +13,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2009-02-27 09:56+0100\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,6 +32,5 @@ msgid "Error"
 msgstr "Fehler"
 
 #: personal/mail/uw-imap/class_mail-methods-uwimap.inc:138
-#, php-format
 msgid "Unable to write procmail script to '%s'."
-msgstr ""
+msgstr "Kann procmail-Skript nicht nach '%s' schreiben."
diff --git a/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po
index 6f767c283..9743fe779 100644
--- a/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/es/LC_MESSAGES/messages.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2010-01-22 21:18+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,4 +32,3 @@ msgstr "Error"
 #, php-format
 msgid "Unable to write procmail script to '%s'."
 msgstr "Impossible d'écrire le script procmail dans '%s'."
-
diff --git a/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po
index 3d259e0f1..f2c8dea06 100644
--- a/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2009-03-06 23:13+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po
index 49c4231b1..56d0e3c91 100644
--- a/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/it/LC_MESSAGES/messages.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/uw-imap/locale/messages.po b/gosa-plugins/uw-imap/locale/messages.po
index 2c100795c..e9e283b26 100644
--- a/gosa-plugins/uw-imap/locale/messages.po
+++ b/gosa-plugins/uw-imap/locale/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po
index 695876dee..528b5b4df 100644
--- a/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/nl/LC_MESSAGES/messages.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po
index 182326977..3099cef45 100644
--- a/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po
index c807e581b..18f095c5d 100644
--- a/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/ru/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po
index 84f9543e1..c3f59c68b 100644
--- a/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/uw-imap/locale/zh/LC_MESSAGES/messages.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po
index f6c5b13a5..1b4d663af 100644
--- a/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/de/LC_MESSAGES/messages.po
@@ -12,17 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2008-04-03 16:04+0200\n"
 "Last-Translator: Jan Wenzel <jan.wenzel@gonicus.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -31,19 +32,19 @@ msgid "This does something"
 msgstr "Dies tut etwas"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 msgid "LDAP error"
 msgstr "LDAP-Fehler"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "WebDAV-Konto"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 msgid "Connectivity addon"
 msgstr "Konnektivitäts-Erweiterung"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Mein Konto"
diff --git a/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po
index d69ae5142..432a84d9b 100644
--- a/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/es/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2010-01-20 00:31+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -28,20 +29,20 @@ msgid "This does something"
 msgstr "Esto hace algo"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 msgid "LDAP error"
 msgstr "Error LDAP"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "Cuenta WebDAV"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 msgid "Connectivity addon"
 msgstr "Conectividad adicional"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Mi cuenta"
 
diff --git a/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po
index ede91029f..ad5ec4bc5 100644
--- a/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/fr/LC_MESSAGES/messages.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-07-19 11:57+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -24,20 +25,20 @@ msgid "This does something"
 msgstr "Ceci fait quelque chose"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 msgid "LDAP error"
 msgstr "Erreur LDAP"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "Compte WebDAV"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 msgid "Connectivity addon"
 msgstr "Connectivité"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Mon Compte"
 
diff --git a/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po
index f7bb07af0..d11d10a6a 100644
--- a/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/it/LC_MESSAGES/messages.po
@@ -6,17 +6,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -25,22 +26,22 @@ msgid "This does something"
 msgstr "Questo fa qualcosa"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 #, fuzzy
 msgid "LDAP error"
 msgstr "Errore LDAP"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "Estenzioni WebDAV"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Connettività"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Identità"
 
diff --git a/gosa-plugins/webdav/locale/messages.po b/gosa-plugins/webdav/locale/messages.po
index cf6ccaba7..4c6ea86d9 100644
--- a/gosa-plugins/webdav/locale/messages.po
+++ b/gosa-plugins/webdav/locale/messages.po
@@ -8,16 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr ""
 
@@ -26,19 +27,19 @@ msgid "This does something"
 msgstr ""
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 msgid "LDAP error"
 msgstr ""
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr ""
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 msgid "Connectivity addon"
 msgstr ""
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr ""
diff --git a/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po
index 3b1514708..8c881c2b6 100644
--- a/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/nl/LC_MESSAGES/messages.po
@@ -11,16 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -29,22 +30,22 @@ msgid "This does something"
 msgstr "Dit doet iets"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP fout:"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "WebDAV Account"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Verbindingen"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Mijn account"
 
diff --git a/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po
index 4e5c207c6..454e04cf2 100644
--- a/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/pl/LC_MESSAGES/messages.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-07-14 21:45+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,7 +16,7 @@ msgstr ""
 "X-Poedit-Basepath: tedst\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -24,22 +25,22 @@ msgid "This does something"
 msgstr "To robi coś"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 #, fuzzy
 msgid "LDAP error"
 msgstr "błąd LDAP:"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "Konto WebDAV"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Konto połączeń"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Moje konto "
 
diff --git a/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po
index 198ef40ad..9aab02401 100644
--- a/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/ru/LC_MESSAGES/messages.po
@@ -5,17 +5,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -24,22 +25,22 @@ msgid "This does something"
 msgstr "Что-то будет"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 #, fuzzy
 msgid "LDAP error"
 msgstr "Ошибка LDAP:"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "Учетная запись WebDAV"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "Подключение"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "Моя учетная запись"
 
diff --git a/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po b/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po
index 135d602f1..6001f019c 100644
--- a/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po
+++ b/gosa-plugins/webdav/locale/zh/LC_MESSAGES/messages.po
@@ -7,17 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 22:31+0100\n"
+"POT-Creation-Date: 2010-10-29 19:39+0200\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:6
-#: personal/connectivity/webdav/class_webdavAccount.inc:166
+#: personal/connectivity/webdav/class_webdavAccount.inc:165
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -27,22 +28,22 @@ msgid "This does something"
 msgstr "******"
 
 #: personal/connectivity/webdav/class_webdavAccount.inc:91
-#: personal/connectivity/webdav/class_webdavAccount.inc:147
+#: personal/connectivity/webdav/class_webdavAccount.inc:146
 #, fuzzy
 msgid "LDAP error"
 msgstr "LDAP 错误:"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #: personal/connectivity/webdav/webdav.tpl:5
 msgid "WebDAV account"
 msgstr "WebDAV 账号"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:167
+#: personal/connectivity/webdav/class_webdavAccount.inc:166
 #, fuzzy
 msgid "Connectivity addon"
 msgstr "互联"
 
-#: personal/connectivity/webdav/class_webdavAccount.inc:171
+#: personal/connectivity/webdav/class_webdavAccount.inc:170
 msgid "My account"
 msgstr "我的账号"