updated the french locales

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

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index b568d3651b75e945e47a6540b9e33f8674a0a285..1798f9f1f3021122618817a541b7a7266ee8d90e 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -48,7 +48,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -57,7 +57,7 @@ msgstr "Correo Electrónico"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:713
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -72,22 +72,22 @@ msgstr "Conectividad"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:711
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:709
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -118,7 +118,7 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:507
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
 #, fuzzy
 msgid "Parameter"
 msgstr "Parametros de inicio"
@@ -164,7 +164,7 @@ msgstr "Importación desde CVS"
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:131
+#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "German"
 msgstr "Alemán"
 
@@ -192,13 +192,168 @@ msgstr "Inglés"
 msgid "Italian"
 msgstr "Italiano"
 
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Esto hace algo"
+
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
+
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
+
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"reenvíos."
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
+"sentido."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"direcciones alternativas"
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+"La dirección de correo que esta intentando añadir, ya esta usada por otro "
+"usuario"
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Por favor introduzca una dirección valida de correo electrónico en el campo "
+"'Cuenta Principal'."
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr "La cuenta principal que ha introducido ya esta en uso."
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr "El valor de 'Tamaño de Cola' no es valido."
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+"Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
+"rechazar mensajes."
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:703
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -233,14 +388,14 @@ msgstr "Lista de direcciones de correo alternativas."
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -251,14 +406,14 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:660
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "Añadir"
@@ -279,13 +434,13 @@ msgstr "Añadir"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
 #: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:21 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Borrar"
 
@@ -375,185 +530,29 @@ msgstr "Usar 'script sive' propios"
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Esto hace algo"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
-
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "Borrar cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "Crear cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"reenvíos."
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
-"sentido."
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"direcciones alternativas"
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-"La dirección de correo que esta intentando añadir, ya esta usada por otro "
-"usuario"
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Por favor introduzca una dirección valida de correo electrónico en el campo "
-"'Cuenta Principal'."
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr "La cuenta principal que ha introducido ya esta en uso."
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "El valor de 'Tamaño de Cola' no es valido."
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-"Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
-"rechazar mensajes."
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:587
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:528
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr "Terminar"
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:610
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
+msgstr "Terminar"
 
 #: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:31
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -568,24 +567,24 @@ msgstr "Terminar"
 #: plugins/addons/addressbook/remove.tpl:17
 #: plugins/admin/groups/class_groupManagement.inc:330
 #: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:51
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
 #: plugins/admin/departments/remove.tpl:17
 #: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:530
+#: plugins/admin/systems/class_systemManagement.inc:529
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Cancelar"
@@ -641,8 +640,8 @@ msgid "Display addresses of department"
 msgstr "Mostrar las direcciones de los departamentos"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
@@ -675,20 +674,20 @@ msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Contraseña"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -750,8 +749,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -774,7 +773,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:256
+#: plugins/admin/users/class_userManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -783,7 +782,7 @@ msgstr ""
 "contraseña' no concuerdan."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:265
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -803,6 +802,19 @@ msgstr "No tiene permisos para cambiar su contraseña."
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione sistema a añadir"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostrar sistemas de departamentos"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Mostrar sistemas que concuerden con"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleccione grupo a añadir"
@@ -863,22 +875,22 @@ msgid "Display groups of department"
 msgstr "Mostrar los grupos de departamentos"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:80
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
 
@@ -892,19 +904,6 @@ msgstr ""
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleccione sistema a añadir"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostrar sistemas de departamentos"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Display systems matching"
-msgstr "Mostrar sistemas que concuerden con"
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -964,6 +963,10 @@ msgstr "Lenguaje por defecto"
 msgid "System trust"
 msgstr "Autentificación del sistema"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Parametros Unix"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -980,7 +983,7 @@ msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:202
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
 msgid "automatic"
 msgstr "automático"
 
@@ -1268,10 +1271,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Parametros Unix"
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Directorio Samba"
@@ -1398,6 +1397,10 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Parametros de samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
@@ -1410,10 +1413,6 @@ msgstr "Mostrar estaciones de trabajo de departamentos"
 msgid "Display workstations matching"
 msgstr "Mostrar estaciones de trabajo que concuerden con"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Parametros de samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
@@ -1521,80 +1520,216 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
-"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
-"codificara esta con el nuevo método seleccionado."
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "mujer"
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Foto Personal"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "hombre"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Eliminar foto"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Guardar"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Información personal"
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
-msgstr "Cambiar foto"
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
-msgid "Name"
-msgstr "Nombre"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr ""
 
-#: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:23
-msgid "Given name"
-msgstr "Nombre"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr ""
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
-msgid "Login"
-msgstr "Inicio"
+#: plugins/personal/generic/class_user.inc:408
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
-msgstr "Título Personal"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/generic.tpl:50
-msgid "Academic title"
-msgstr "Títulos academicos"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/generic.tpl:58
-msgid "Date of birth"
-msgstr "Fecha de nacimiento"
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr "No se puede añadir el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/generic.tpl:75
-#: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
-msgid "Set"
-msgstr "por debajo"
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 
-#: plugins/personal/generic/generic.tpl:81
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr "No tiene permisos para transladar a un usuario de su base original"
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:528
+msgid "The required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "The required field 'Given name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr " El campo requerido 'Login' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
+"base de datos."
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
+"guiones están permitidos."
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "El campo 'Pagina web principal' contiene un URL no valida"
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "El campo 'Fax' contiene un número de teléfono no valido."
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+"El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
+
+#: plugins/personal/generic/class_user.inc:1070
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "No puedo seleccionar la base de datos."
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
+"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
+"codificara esta con el nuevo método seleccionado."
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Información personal"
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Foto Personal"
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr "Cambiar foto"
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+msgid "Name"
+msgstr "Nombre"
+
+#: plugins/personal/generic/generic.tpl:30
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:23
+msgid "Given name"
+msgstr "Nombre"
+
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+msgid "Login"
+msgstr "Inicio"
+
+#: plugins/personal/generic/generic.tpl:42
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
+msgstr "Título Personal"
+
+#: plugins/personal/generic/generic.tpl:50
+msgid "Academic title"
+msgstr "Títulos academicos"
+
+#: plugins/personal/generic/generic.tpl:58
+msgid "Date of birth"
+msgstr "Fecha de nacimiento"
+
+#: plugins/personal/generic/generic.tpl:75
+#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14
+msgid "Set"
+msgstr "por debajo"
+
+#: plugins/personal/generic/generic.tpl:81
+msgid "Sex"
 msgstr "Sexo"
 
 #: plugins/personal/generic/generic.tpl:92
@@ -1666,9 +1801,9 @@ msgstr "Organización"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1694,8 +1829,8 @@ msgid "Room No."
 msgstr "Habitación No."
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Teléfono Móvil"
@@ -1772,6 +1907,15 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Eliminar foto"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Guardar"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -1782,7 +1926,7 @@ msgstr "Certificado estandar"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
@@ -1799,183 +1943,126 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr "mujer"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr "hombre"
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Información genérica del usuario"
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr "Esta cuenta no tiene extensiones GOsa validas"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr "Por favor introduzca un número de serie válido"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "El valor especificado como 'relación' no es válido"
 
-#: plugins/personal/generic/class_user.inc:408
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Editar certificados"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr "La comunicación con la base de datos Kerberos ha fallado"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Cuenta proxy"
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr "Filtrar contenido indeseable (p.e. pornografía o contenido violento)"
 
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr "No se puede añadir el usuario de la base de datos Kerberos"
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Limitar acceso al proxy al horario laboral"
 
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Restringir el uso del proxy con cuota"
 
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr "No tiene permisos para transladar a un usuario de su base original"
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "por"
 
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:505
-msgid "The required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
-
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:508
-msgid "The required field 'Given name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
-msgstr " El campo requerido 'Login' no ha sido rellenado."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr "Kolab"
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
 msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
-"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
-"base de datos."
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"reenvíos."
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
-"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
-"guiones están permitidos."
-
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "El campo 'Pagina web principal' contiene un URL no valida"
-
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
-
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
-msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
-
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
-
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "El campo 'Fax' contiene un número de teléfono no valido."
-
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
+"La dirección de correo primaria que esta intentando añadir, ya esta usada "
+"por otro usuario"
 
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr ""
-"El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr "Aceptar siempre"
 
-#: plugins/personal/generic/class_user.inc:1070
-#, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "No puedo seleccionar la base de datos."
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr "Denegar siempre"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "¡No tiene permisos para cambiar su contraseña!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr "Denegar si hay conflictos"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr "Preguntar si hay conflictos"
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Cuenta proxy"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr "Manual"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Filtrar contenido indeseable (p.e. pornografía o contenido violento)"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr "Anónimo"
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Limitar acceso al proxy al horario laboral"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr "El valor especificado como presencia futura necesita ser un entero."
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Restringir el uso del proxy con cuota"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr "El valor especificado como Dirección URL de  no es válido"
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "por"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr ""
+"La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/intranet.tpl:1
-#, fuzzy
-msgid "Intranet account"
-msgstr "Crear cuenta telefónica"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
+"¡No hay ningún usuario con cuenta de correo '%s' para su política de "
+"invitación!"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -2031,6 +2118,51 @@ msgstr "días"
 msgid "Invitation policy"
 msgstr "Política de invitación"
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Esta cuenta tiene sus características samba desactivadas, las "
+"características Posix son necesarias para las cuentas samba, activelas "
+"primero."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Esta cuenta tiene sus características samba desactivadas, las "
+"características Posix son necesarias para las cuentas samba, activelas "
+"primero."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr "No puedo conectar al servidor de base de datos postgresql."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+"¡Los parámetros necesarios para extensión de conectividad open-xchange no "
+"son validos!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "Cuenta FTP"
@@ -2112,6 +2244,15 @@ msgstr "Información de Usuario"
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
+#: plugins/personal/connectivity/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "Esta cuenta no tiene extensiones de conectividad"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2154,147 +2295,62 @@ msgstr "El valor de 'Tamaño de Cola' no es valido."
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Nombre de la lista"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr "Kolab"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"reenvíos."
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr ""
-"La dirección de correo primaria que esta intentando añadir, ya esta usada "
-"por otro usuario"
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
+msgstr "Tipo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr "Aceptar siempre"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr "Denegar siempre"
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
+msgstr "Descripción"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr "Denegar si hay conflictos"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Descripción de esta lista de bloqueos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr "Preguntar si hay conflictos"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Manual"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anónimo"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr "El valor especificado como presencia futura necesita ser un entero."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr "El valor especificado como Dirección URL de  no es válido"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr ""
-"La entrada de la política de invitación para la dirección '%s' no es valida."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
-msgstr ""
-"¡No hay ningún usuario con cuenta de correo '%s' para su política de "
-"invitación!"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr "El valor especificado como 'Archivos' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
-msgstr "El valor especificado como 'Tamaño' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-#, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Esta cuenta tiene sus características samba desactivadas, las "
-"características Posix son necesarias para las cuentas samba, activelas "
-"primero."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-#, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Esta cuenta tiene sus características samba desactivadas, las "
-"características Posix son necesarias para las cuentas samba, activelas "
-"primero."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
-msgstr "No puedo conectar al servidor de base de datos postgresql."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-"¡Los parámetros necesarios para extensión de conectividad open-xchange no "
-"son validos!"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Números bloqueados"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+msgid "Information"
+msgstr "Información"
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
-msgstr "Esta cuenta no tiene extensiones de conectividad"
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
+msgstr "Los números pueden contener también comodínes"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
@@ -2315,10 +2371,10 @@ msgstr "Por favor especifique un usuario valido."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #, fuzzy
@@ -2327,10 +2383,10 @@ msgstr "Nombre del departamento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
@@ -2339,10 +2395,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:357
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2351,10 +2407,10 @@ msgstr "Lista de Departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2363,9 +2419,9 @@ msgstr "Reiniciar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2374,10 +2430,10 @@ msgstr "Seleccione para ver los departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2396,10 +2452,10 @@ msgstr "Listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 #, fuzzy
@@ -2408,10 +2464,10 @@ msgstr "Contraseña actual"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #, fuzzy
@@ -2420,10 +2476,10 @@ msgstr "Mostrar departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit"
@@ -2431,10 +2487,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
@@ -2442,7 +2498,7 @@ msgid "edit"
 msgstr "Editar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2450,10 +2506,10 @@ msgstr "Usuario administrador"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
@@ -2461,7 +2517,7 @@ msgid "delete"
 msgstr "Borrar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2475,10 +2531,10 @@ msgstr "Gestión de listas de bloqueo"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/class_systemManagement.inc:578
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Actions"
@@ -2517,63 +2573,6 @@ msgstr "El nombre especificado ya esta siendo usado"
 msgid "No permission to create a blocklist on this base."
 msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Nombre de la lista"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nombre de la lista de bloqueos"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr "Tipo"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr "Descripción"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Descripción de esta lista de bloqueos"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Números bloqueados"
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-msgid "Information"
-msgstr "Información"
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr "Los números pueden contener también comodínes"
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2634,22 +2633,14 @@ msgstr "Seleccione para mostrar listas de bloqueo entrantes"
 msgid "Show receive blocklists"
 msgstr "Mostrar listas de bloqueos entrantes"
 
-#: plugins/gofax/blocklists/headpage.tpl:48
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr "Mostrar listas que contengan"
 
-#: plugins/gofax/blocklists/headpage.tpl:51
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr "Expresiones regulares para encontrar nombres de listas"
 
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr "Mostrar listas que contengan"
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr "Mostrar listas que contengan los números ya introducidos"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Gestión de listas de bloqueo"
@@ -2756,8 +2747,8 @@ msgid "List of predefined blocklists"
 msgstr "Listas de listas de bloqueos predefinidas"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2877,40 +2868,6 @@ msgstr "Tiempo de envio"
 msgid "# pages"
 msgstr "# páginas"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Informes de FAX"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr "¡La consulta a la base de datos de fax ha fallado!"
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"¡No tiene permisos para recuperar información sobre el identificador (ID) "
-"del fax!"
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2965,67 +2922,50 @@ msgstr "Receptor"
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Reportes de FAX"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "Informes de FAX"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Marcando conexión"
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
-msgid "Dial"
-msgstr "Llamar"
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
+msgstr "¡La consulta a la base de datos de fax ha fallado!"
 
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Personal"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"¡No tiene permisos para recuperar información sobre el identificador (ID) "
+"del fax!"
 
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Iniciales"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr "Y-M-D"
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Reportes de FAX"
 
-#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privado"
 
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "De organización"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Compañia"
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Ciudad"
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Pais"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Contacto"
@@ -3084,6 +3024,57 @@ msgstr "Elegir el objeto que sera buscado"
 msgid "Search string"
 msgstr "Cadena de busqueda"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Marcando conexión"
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr "Llamar"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Elija un departamento para guardar la entrada"
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personal"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Iniciales"
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "De organización"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Compañia"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Ciudad"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Pais"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3470,6 +3461,55 @@ msgstr "Mensaje"
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr ""
+"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
+"archivo de configuración!"
+
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "No tiene permisos para crear un grupo en esta 'Base'."
+
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
+"numeros y guiones."
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
@@ -3494,6 +3534,24 @@ msgstr "Miembro con Permisos"
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Administración de grupos"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3536,7 +3594,7 @@ msgid "Delete this entry"
 msgstr "Borrar"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -3555,7 +3613,7 @@ msgid "Groupname"
 msgstr "Nombre del grupo"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:645
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3569,55 +3627,6 @@ msgstr "Propiedades"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
-"archivo de configuración!"
-
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
-msgstr "Este 'dn' no es un grupo."
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "No tiene permisos para crear un grupo en esta 'Base'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
-"numeros y guiones."
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
-
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -3626,23 +3635,9 @@ msgstr ""
 "Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
 "quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Administración de grupos"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista de grupos"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3725,7 +3720,7 @@ msgid "Display users of department"
 msgstr "Mostrar usuarios del departamento"
 
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:48
 msgid "Display users matching"
 msgstr "Mostrar usuarios que concuerden con"
 
@@ -3792,10 +3787,6 @@ msgstr "Miembros del grupo"
 msgid "Folder administrators"
 msgstr "Administradores de Carpetas"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
@@ -3849,136 +3840,160 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
-msgstr "Usuarios"
-
-#: plugins/admin/users/class_userManagement.inc:239
-#: plugins/admin/users/class_userManagement.inc:290
-msgid "You are not allowed to set this users password!"
-msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
 
-#: plugins/admin/users/class_userManagement.inc:326
-#, php-format
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
+"valores en la base de datos serán rellenado automáticamente. Elegir "
+"<b>ninguno</b> para saltarse el uso de plantillas."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Plantilla"
+
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Continuar"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administración de Usuarios"
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+msgstr "Usuarios"
+
+#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:313
+msgid "You are not allowed to set this users password!"
+msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
+
+#: plugins/admin/users/class_userManagement.inc:349
+#, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:355
+#: plugins/admin/users/class_userManagement.inc:383
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:450
+#: plugins/admin/users/class_userManagement.inc:473
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:672
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:703
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:704
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:708
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:710
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:712
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:714
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:868
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
-msgid "Template"
-msgstr "Plantilla"
+#: plugins/admin/users/class_userManagement.inc:715
+#, fuzzy
+msgid "Create user from template"
+msgstr "Nueva plantilla"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
+#: plugins/admin/users/class_userManagement.inc:716
+#, fuzzy
+msgid "Create user with this template"
+msgstr "Nueva plantilla"
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-msgstr ""
-"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
-"valores en la base de datos serán rellenado automáticamente. Elegir "
-"<b>ninguno</b> para saltarse el uso de plantillas."
+#: plugins/admin/users/class_userManagement.inc:771
+#, fuzzy
+msgid "Online"
+msgstr "en linea"
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Continuar"
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Offline"
+msgstr "fuera de linea"
 
 #: plugins/admin/users/remove.tpl:7
 msgid ""
@@ -4053,46 +4068,6 @@ msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
 msgid "Show proxy users"
 msgstr "Mostrar los usuarios de proxy"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administración de Usuarios"
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Eliminar opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Crear opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Añadir opción"
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "El valor '%s' especificado como nombre de opción no es valido."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -4152,6 +4127,42 @@ msgstr "Colocar icono en los escritorios de los miembros "
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Eliminar opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Añadir opción"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "El valor '%s' especificado como nombre de opción no es valido."
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -4189,6 +4200,27 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
+
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
+msgstr "¡No tiene permisos para eliminar esta aplicación!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "new"
+msgstr "Nuevo"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#, fuzzy
+msgid "Create new application"
+msgstr "Crear aplicaciones"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
@@ -4213,27 +4245,6 @@ msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
-
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
-msgid "You are not allowed to delete this application!"
-msgstr "¡No tiene permisos para eliminar esta aplicación!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "new"
-msgstr "Nuevo"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#, fuzzy
-msgid "Create new application"
-msgstr "Crear aplicaciones"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nombre del departamento"
@@ -4313,11 +4324,10 @@ msgstr ""
 "departamentos, cuando trabaja con un gran número de departamentos."
 
 #: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/departments/headpage.tpl:45
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
@@ -4325,27 +4335,6 @@ msgstr "Expresiones regulares para encontrar nombres de departamentos"
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "No tiene permisos para crear un departamento en esta 'Base'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr "Por favor elija otro nombre."
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4389,6 +4378,27 @@ msgstr "departamentos"
 msgid ".."
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr "No tiene permisos para crear un departamento en esta 'Base'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
+msgstr "Por favor elija otro nombre."
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4438,6 +4448,10 @@ msgstr "Dirección IP"
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
@@ -4561,16 +4575,52 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_terminalService.inc:83
-msgid "default"
-msgstr "por defecto"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/class_terminalService.inc:84
-msgid "show chooser"
-msgstr "mostrar elegidos"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "Exportación NFS"
 
-#: plugins/admin/systems/class_terminalService.inc:85
-msgid "direct"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "default"
+msgstr "por defecto"
+
+#: plugins/admin/systems/class_terminalService.inc:84
+msgid "show chooser"
+msgstr "mostrar elegidos"
+
+#: plugins/admin/systems/class_terminalService.inc:85
+msgid "direct"
 msgstr "Directo"
 
 #: plugins/admin/systems/class_terminalService.inc:88
@@ -4599,45 +4649,28 @@ msgstr "Por favor especifique un rango VSync valido"
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Gestión del sistema"
-
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "Exportación NFS"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: plugins/admin/systems/class_servDB.inc:172
+#, fuzzy, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
@@ -4661,6 +4694,76 @@ msgstr "Acción"
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Nombre de terminal"
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr "Modo"
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Servidor Raíz"
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
+"intercambio"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4737,10 +4840,6 @@ msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Esta 'dn' no tiene características de servidor."
@@ -4754,72 +4853,6 @@ msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nombre de terminal"
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr "Modo"
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Servidor Raíz"
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
-"intercambio"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que será usado para sincronización horaria"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acción que se ejecutara en este terminal"
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
@@ -4844,6 +4877,18 @@ msgstr ""
 "Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
 "aquí."
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Nombre de la impresora"
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "URL de la impresora"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Ruta al 'PPD'"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr "Esta 'dn' no tiene características de estación de trabajo."
@@ -4861,200 +4906,187 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr "¡No puede editar este tipo de objeto todavía!"
 
-#: plugins/admin/systems/class_systemManagement.inc:339
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
 
-#: plugins/admin/systems/class_systemManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
 
-#: plugins/admin/systems/class_systemManagement.inc:396
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:402
-#: plugins/admin/systems/class_systemManagement.inc:466
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
 #, fuzzy
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
 #, fuzzy
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:559
 #, fuzzy
 msgid "New Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:560
 #, fuzzy
 msgid "New Printer"
 msgstr "Impresora"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:561
 #, fuzzy
 msgid "New Phone"
 msgstr "Teléfono"
 
-#: plugins/admin/systems/class_systemManagement.inc:563
+#: plugins/admin/systems/class_systemManagement.inc:562
 #, fuzzy
 msgid "New Component"
 msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-#, fuzzy
-msgid "New system"
-msgstr "Borrar"
-
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #, fuzzy
 msgid "Delete system"
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #, fuzzy
 msgid "System"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:584
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 #, fuzzy
 msgid "Cups Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 #, fuzzy
 msgid "Mail Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 #, fuzzy
 msgid "Imap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 #, fuzzy
 msgid "Fax Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #, fuzzy
 msgid "Set root password"
 msgstr "Poner Contraseña"
 
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:700
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminales"
 
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:701
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 #, fuzzy
 msgid "Winstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 #, fuzzy
 msgid "Network Device"
 msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
 #: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Nombre de la impresora"
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "URL de la impresora"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Ruta al 'PPD'"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "No tiene permisos para crear una impresora en esta 'Base'."
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -5078,29 +5110,6 @@ msgstr ""
 "Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, fuzzy, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
@@ -5235,14 +5244,6 @@ msgstr "No se han indicado redes privilegiadas SMTP."
 msgid "No SMTP smarthost/relayhost set."
 msgstr "No se ha indicado SMTP smarthost/relayhost"
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "No tiene permisos para crear una impresora en esta 'Base'."
-
 #: plugins/admin/systems/servkolab.tpl:14
 msgid "POP3 service"
 msgstr "Servicio POP3"
@@ -5322,94 +5323,6 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 "Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/phonesettings.tpl:1
-#, fuzzy
-msgid "Specific Phone settings"
-msgstr "Configuración telefónica"
-
-#: plugins/admin/systems/phonesettings.tpl:9
-#, fuzzy
-msgid "Phone type"
-msgstr "Número de teléfono"
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-#, fuzzy
-msgid "Choose a phone type"
-msgstr "Elija tipo de ratón"
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:35
-#, fuzzy
-msgid "DTMF mode"
-msgstr "Modo"
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-#, fuzzy
-msgid "Default IP"
-msgstr "por defecto"
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:80
-#, fuzzy
-msgid "Modus"
-msgstr "Ratón"
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:121
-#, fuzzy
-msgid "Secret"
-msgstr "Calle"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:150
-#, fuzzy
-msgid "Account code"
-msgstr "Cuenta"
-
-#: plugins/admin/systems/phonesettings.tpl:158
-#, fuzzy
-msgid "Trunk lines"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/systems/phonesettings.tpl:173
-#, fuzzy
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
-
-#: plugins/admin/systems/phonesettings.tpl:188
-#, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "¡No tiene permisos para eliminar este componente!"
-
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
-
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
 msgstr "Nombre de la maquina"
@@ -5497,30 +5410,19 @@ msgstr "Seleccione para ver los dispositivos de red"
 msgid "Show network devices"
 msgstr "Mostrar dispositivos de Red"
 
-#: plugins/admin/systems/headpage.tpl:54
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr "Expresiones regulares para encontrar nombres de sistemas"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
-msgstr "Mostrar terminal(es) del usuario"
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-#, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr "Teclado"
@@ -5704,6 +5606,18 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Cambiar la contraseña afecta solamente a la autenticación."
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr "Nombre del dispositivo"
@@ -5889,39 +5803,118 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminales"
+#: plugins/admin/systems/phonesettings.tpl:1
+#, fuzzy
+msgid "Specific Phone settings"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#: plugins/admin/systems/phonesettings.tpl:9
 #, fuzzy
-msgid "Phone queue"
+msgid "Phone type"
 msgstr "Número de teléfono"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+#, fuzzy
+msgid "Choose a phone type"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
+#: plugins/admin/systems/phonesettings.tpl:35
 #, fuzzy
-msgid "Primary mail address for this distribution list"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+msgid "DTMF mode"
+msgstr "Modo"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione objetos a añadir"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+#, fuzzy
+msgid "Default IP"
+msgstr "por defecto"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Seleccione para ver los departamentos"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Mostrar departamentos"
+#: plugins/admin/systems/phonesettings.tpl:80
+#, fuzzy
+msgid "Modus"
+msgstr "Ratón"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr "Seleccione para ver las cuentas GOsa"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+#, fuzzy
+msgid "Secret"
+msgstr "Calle"
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+#, fuzzy
+msgid "Account code"
+msgstr "Cuenta"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+#, fuzzy
+msgid "Trunk lines"
+msgstr "Clientes Ligeros"
+
+#: plugins/admin/systems/phonesettings.tpl:173
+#, fuzzy
+msgid "Hosts that are allowed to connect"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
+
+#: plugins/admin/systems/phonesettings.tpl:188
+#, fuzzy
+msgid "Hosts that are not allowed to connect"
+msgstr "¡No tiene permisos para eliminar este componente!"
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminales"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#, fuzzy
+msgid "Phone queue"
+msgstr "Número de teléfono"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Seleccione objetos a añadir"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr "Seleccione para ver los departamentos"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr "Mostrar departamentos"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
+msgstr "Seleccione para ver las cuentas GOsa"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Show people"
@@ -5989,57 +5982,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Seleccione una acción que se ejecutara en este grupo de terminales"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Grupos de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "Cuentas UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr "Servidores"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr "Estaciones de trabajo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Has decidido eliminar el objeto grupo '%s'."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr "¡No tiene permisos para eliminar este objeto grupo!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "Create new object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Grupo"
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
@@ -6100,6 +6042,57 @@ msgstr "'Grupos de objetos que necesitan al menos un miembro!"
 msgid "You can combine two different object types at maximum only!"
 msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Grupos de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr "Cuentas UNIX"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr "Servidores"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr "Clientes Ligeros"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr "Estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Has decidido eliminar el objeto grupo '%s'."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
+msgstr "¡No tiene permisos para eliminar este objeto grupo!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "Create new object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Grupo"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nombre del grupo"
@@ -6108,22 +6101,6 @@ msgstr "Nombre del grupo"
 msgid "Member objects"
 msgstr "Objetos miembro"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-#, fuzzy
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-#, fuzzy
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
-
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -6174,496 +6151,318 @@ msgstr "Mostrar grupos que contienen terminales"
 msgid "Show groups containing printers"
 msgstr "Mostrar grupos que contienen impresoras"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
 msgid "Display object groups matching"
 msgstr "Mostrar objetos que concuerden con"
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-#, fuzzy
-msgid "Queue Settings"
-msgstr "Parámetros de quotas"
-
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
+#: plugins/admin/ogroups/mail.tpl:11
 #, fuzzy
-msgid "Generic queue Settings"
-msgstr "Información genérica del usuario"
+msgid "Primary mail address for this distribution list"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 #, fuzzy
-msgid "Phone Number"
-msgstr "Número de teléfono"
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
 
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 #, fuzzy
-msgid "Down"
-msgstr "Dominio"
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/class_phonequeue.inc:83
 #, fuzzy
-msgid "Timeout"
-msgstr "Tiempo(s) excedido(s)"
-
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Reintentar"
+msgid "Remove the phone queue from this Account"
+msgstr "Eliminar cuenta telefónica"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/class_phonequeue.inc:84
 #, fuzzy
-msgid "Strategy"
-msgstr "Estado"
-
-#: plugins/admin/ogroups/phonequeue.tpl:67
-msgid "Max queue length"
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
+"Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
+"pulsando aquí."
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid "Create phone queue"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
+"Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
+"pulsando aquí."
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
-msgid "(in seconds)"
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
-msgid "Announce holdtime"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:106
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:114
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:122
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:130
-msgid "Queue sound file setup"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:135
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:144
-msgid "Music on hold"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:152
-#, fuzzy
-msgid "Welcome sound file"
-msgstr "¡Bienvenido %s!"
-
-#: plugins/admin/ogroups/phonequeue.tpl:160
-#, fuzzy
-msgid "Announce message"
-msgstr "Mensaje de ausencia"
-
-#: plugins/admin/ogroups/phonequeue.tpl:168
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:176
-msgid "'There are ...'"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:184
-msgid "'... calls waiting'"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:192
-#, fuzzy
-msgid "'Thank you' message"
-msgstr "Estado del mensaje"
-
-#: plugins/admin/ogroups/phonequeue.tpl:200
-msgid "'minutes' sound file"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:208
-msgid "'seconds' sound file"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:216
-msgid "Hold sound file"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-#, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "Eliminar cuenta telefónica"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-#, fuzzy
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
-msgstr ""
-"Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
-"pulsando aquí."
-
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid "Create phone queue"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
-"pulsando aquí."
-
-#: plugins/admin/ogroups/class_phonequeue.inc:131
-msgid "Uruguai"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "No"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:132
+#: plugins/admin/ogroups/class_phonequeue.inc:135
 #, fuzzy
 msgid "Yes"
 msgstr "Sistemas"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:133
+#: plugins/admin/ogroups/class_phonequeue.inc:136
 msgid "ring all available channels until one answers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
+#: plugins/admin/ogroups/class_phonequeue.inc:137
 msgid "take turns ringing each available interface"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
+#: plugins/admin/ogroups/class_phonequeue.inc:138
 msgid "ring interface which was least recently called by this queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
+#: plugins/admin/ogroups/class_phonequeue.inc:139
 msgid "ring the one with fewest completed calls from this queue"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:140
 msgid "ring random interface"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:141
 msgid "round robin with memory, remember where we left off last ring pass"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
+#: plugins/admin/ogroups/class_phonequeue.inc:178
 #, fuzzy
 msgid "Timeout must be numeric"
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
+#: plugins/admin/ogroups/class_phonequeue.inc:181
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
+#: plugins/admin/ogroups/class_phonequeue.inc:184
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
+#: plugins/admin/ogroups/class_phonequeue.inc:187
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
+#: plugins/admin/ogroups/class_phonequeue.inc:190
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-#: plugins/admin/ogroups/class_phonequeue.inc:511
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:922
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:221
-#: plugins/admin/ogroups/class_phonequeue.inc:521
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
 #: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
 #, fuzzy, php-format
 msgid "Can't select database %s on %s."
 msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:255
-#: plugins/admin/ogroups/class_phonequeue.inc:410
-#: plugins/admin/ogroups/class_phonequeue.inc:561
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
 #, fuzzy, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:439
-#: plugins/admin/ogroups/class_phonequeue.inc:441
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
+#: plugins/admin/ogroups/class_phonequeue.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
-msgid "Phone macros"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, fuzzy, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
+msgid "Queue Settings"
+msgstr "Parámetros de quotas"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-#, fuzzy
-msgid "You are not allowed to delete this macro!"
-msgstr "¡No le está permitido eliminar este grupo!"
+#: plugins/admin/ogroups/phonequeue.tpl:6
+msgid "Generic queue setup"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:140
 #, fuzzy
-msgid "Create new phone macro"
-msgstr "Crear cuenta telefónica"
+msgid "Generic queue Settings"
+msgstr "Información genérica del usuario"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/admin/ogroups/phonequeue.tpl:11
 #, fuzzy
-msgid "Visible"
-msgstr "Variable"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
+msgid "Phone Number"
+msgstr "Número de teléfono"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/admin/ogroups/phonequeue.tpl:23
 #, fuzzy
-msgid "Macro"
-msgstr "Nombre de la maquina"
+msgid "Down"
+msgstr "Dominio"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/admin/ogroups/phonequeue.tpl:39
 #, fuzzy
-msgid "visible"
-msgstr "Visible Publicamente"
+msgid "Timeout"
+msgstr "Tiempo(s) excedido(s)"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Visible Publicamente"
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:91
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+#: plugins/admin/ogroups/phonequeue.tpl:55
 #, fuzzy
-msgid "This 'dn' is no phone macro."
-msgstr "Esta 'dn' no tiene características de teléfono."
+msgid "Strategy"
+msgstr "Estado"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:147
-msgid ""
-"This macro ist still in use. To delete this Macro ensure that nobody has "
-"selected this Macro."
+#: plugins/admin/ogroups/phonequeue.tpl:67
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:232
-#, php-format
-msgid "Unable to parse macro contents on line: %s"
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Announce frequency"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:250
-#, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+#: plugins/admin/ogroups/phonequeue.tpl:79
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:259
-#: plugins/gofon/macro/class_gofonMacro.inc:267
-#, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+#: plugins/admin/ogroups/phonequeue.tpl:84
+msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+#: plugins/admin/ogroups/phonequeue.tpl:98
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:323
-#, fuzzy, php-format
-msgid "The given cn '%s' already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
-
-#: plugins/gofon/macro/class_gofonMacro.inc:328
-msgid "You must specify the 'Display Name' in order to save this macro"
+#: plugins/admin/ogroups/phonequeue.tpl:106
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
-msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+#: plugins/admin/ogroups/phonequeue.tpl:114
+msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:337
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+#: plugins/admin/ogroups/phonequeue.tpl:122
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:343
-msgid "Makro length must be lower than 100 lines"
+#: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:348
-#, fuzzy
-msgid "Please choose a valid  base."
-msgstr "Por favor especifique un rango VSync valido"
-
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-#, fuzzy
-msgid "Macro name"
-msgstr "Nombre de la maquina"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/admin/ogroups/phonequeue.tpl:138
+msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-#, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
+#: plugins/admin/ogroups/phonequeue.tpl:143
+msgid "Use music on hold instead of ringing"
+msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-#, fuzzy
-msgid "Visible for user"
-msgstr "Lista de usuarios"
+#: plugins/admin/ogroups/phonequeue.tpl:152
+msgid "Music on hold"
+msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/admin/ogroups/phonequeue.tpl:160
 #, fuzzy
-msgid "Macro text"
-msgstr "Nombre de la maquina"
+msgid "Welcome sound file"
+msgstr "¡Bienvenido %s!"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: plugins/admin/ogroups/phonequeue.tpl:168
 #, fuzzy
-msgid "String"
-msgstr "durante"
+msgid "Announce message"
+msgstr "Mensaje de ausencia"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: plugins/admin/ogroups/phonequeue.tpl:176
+msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: plugins/admin/ogroups/phonequeue.tpl:184
+msgid "'There are ...'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-#, fuzzy
-msgid "Delete unused"
-msgstr "Borrar"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+#: plugins/admin/ogroups/phonequeue.tpl:192
+msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
-#, fuzzy, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+#: plugins/admin/ogroups/phonequeue.tpl:200
+#, fuzzy
+msgid "'Thank you' message"
+msgstr "Estado del mensaje"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
+#: plugins/admin/ogroups/phonequeue.tpl:208
+msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:216
+msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-#, fuzzy
-msgid "List of macros"
-msgstr "Lista de grupos"
-
-#: plugins/gofon/macro/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Hold sound file"
 msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
-
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mostrar grupos que concuerden con"
-
-#: plugins/gofon/macro/headpage.tpl:44
-#, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Expresión regular que concuerde con nombres de grupos"
-
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-#, fuzzy
-msgid "Phone macro management"
-msgstr "Gestión del sistema"
-
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argumentos"
 
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Configuración telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
 msgid "no macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
 #, fuzzy
 msgid "undefined"
 msgstr "sin definirse"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
 #, fuzzy
 msgid "Error while performing query "
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:492
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
 msgid ""
 "The macro you selected in the past, is no longer available for you, please "
 "choose another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:576
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -6671,11 +6470,21 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:578
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+#, fuzzy
+msgid ""
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
+msgstr ""
+"Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
+"pulsando aquí."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -6683,49 +6492,55 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
 #, fuzzy, php-format
 msgid "You need to specify a Phone PIN."
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:777
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
 #, php-format
 msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
 msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:794
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
 msgid "The number '%s' is no valid phone number!"
 msgstr "¡El número '%s' no es un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, fuzzy, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
@@ -6754,15 +6569,16 @@ msgstr "Tiempo(s) excedido(s)"
 msgid "Phone macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/generic.tpl:77
+#: plugins/gofon/phoneaccount/generic.tpl:67
+#, fuzzy
+msgid "fill out"
+msgstr "Salir"
+
+#: plugins/gofon/phoneaccount/generic.tpl:78
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Teléfono"
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Configuración telefónica"
-
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Informes telefónicos"
@@ -6803,6 +6619,216 @@ msgstr "Duración"
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+#, fuzzy
+msgid "This 'dn' is no phone macro."
+msgstr "Esta 'dn' no tiene características de teléfono."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:147
+msgid ""
+"This macro ist still in use. To delete this Macro ensure that nobody has "
+"selected this Macro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#, php-format
+msgid "Unable to parse macro contents on line: %s"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:250
+#, php-format
+msgid "Can't perform SELECT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:259
+#: plugins/gofon/macro/class_gofonMacro.inc:267
+#, php-format
+msgid "Can't perform DELETE query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:281
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:323
+#, fuzzy, php-format
+msgid "The given cn '%s' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:328
+msgid "You must specify the 'Display Name' in order to save this macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:332
+msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:337
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:343
+msgid "Makro length must be lower than 100 lines"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+#, fuzzy
+msgid "Please choose a valid  base."
+msgstr "Por favor especifique un rango VSync valido"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#, fuzzy
+msgid "Macro name"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
+#, fuzzy
+msgid "Choose subtree to place macro in"
+msgstr "Elija lugar del árbol para colocar la aplicación"
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Lista de usuarios"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:41
+#, fuzzy
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#, fuzzy
+msgid "Phone macro management"
+msgstr "Gestión del sistema"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#, fuzzy
+msgid "String"
+msgstr "durante"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#, fuzzy
+msgid "Delete unused"
+msgstr "Borrar"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, fuzzy, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "Está a punto de borrar el grupo '%s'."
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#, fuzzy
+msgid "You are not allowed to delete this macro!"
+msgstr "¡No le está permitido eliminar este grupo!"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Variable"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Visible Publicamente"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Visible Publicamente"
+
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argumentos"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Cliente ligero"
@@ -6847,31 +6873,6 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-#, fuzzy
-msgid "Can't create/open File"
-msgstr "Fichero de configuración"
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr ""
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -7099,18 +7100,41 @@ msgstr ""
 "No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
 "s'"
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
-"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
+"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
+"favor actualízela usando el script 'fix_config.sh'!"
 
-#: include/class_password-methods.inc:165
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
+"los cambios?"
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Este 'dn' no tiene extensiones de cuenta."
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Esta es un extensión vacía."
+
+#: include/class_plugin.inc:398
 #, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:426
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -7118,6 +7142,40 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "Error XML en 'gosa.conf': %s en la linea %d"
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
+"sistemas."
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "SID y/o RIDBASE no se encuentran en su configuración."
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -7125,23 +7183,92 @@ msgstr ""
 "La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
 "pueden cambiar las contraseñas de SAMBA."
 
-#: include/class_pluglist.inc:98
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
-"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
-"favor actualízela usando el script 'fix_config.sh'!"
+"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
+"soporte Kerberos, la contraseña no ha sido cambiada."
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "¡La comunicación con la base de datos Kerberos fallo!."
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+
+#: include/class_ldap.inc:438
+#, php-format
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
+"favor, informe de esto al equipo de desarrollo de GOsa."
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
+"en la linea %s"
+
+#: include/class_ldap.inc:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
+"el LDIF desde la linea %s en adelante!"
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+#, fuzzy
+msgid "Can't create/open File"
+msgstr "Fichero de configuración"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
-"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
-"los cambios?"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7576,141 +7703,40 @@ msgstr ""
 
 #: include/functions_setup.inc:778
 msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
-msgstr ""
-"Conexión al servidor correcta, pero el servidor aparenta estar completamente "
-"vacíos, por favor compruebe la información de nuevo."
-
-#: include/functions_setup.inc:834
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
-
-#: include/functions_setup.inc:865
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
-msgstr ""
-
-#: include/functions_setup.inc:874
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
-
-#: include/functions_setup.inc:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
-
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Error XML en 'gosa.conf': %s en la linea %d"
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
-"sistemas."
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "SID y/o RIDBASE no se encuentran en su configuración."
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
-"soporte Kerberos, la contraseña no ha sido cambiada."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "¡La comunicación con la base de datos Kerberos fallo!."
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
-#: include/class_ldap.inc:438
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
-"favor, informe de esto al equipo de desarrollo de GOsa."
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all informations twice"
 msgstr ""
-"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
-"en la linea %s"
-
-#: include/class_ldap.inc:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
+"Conexión al servidor correcta, pero el servidor aparenta estar completamente "
+"vacíos, por favor compruebe la información de nuevo."
 
-#: include/class_ldap.inc:700
+#: include/functions_setup.inc:834
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
 msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Este 'dn' no tiene extensiones de cuenta."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Esta es un extensión vacía."
+"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/class_plugin.inc:398
-#, php-format
+#: include/functions_setup.inc:865
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
 msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
 
-#: include/class_plugin.inc:454
+#: include/functions_setup.inc:874
 #, php-format
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
+
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
+#: ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
+"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
@@ -7756,6 +7782,32 @@ msgstr ""
 "El directorio '%s' especificado como directorio de compilación para smarty  "
 "no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
 
+#: html/main.php:96
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+"'Register globals' está activado. No se permitirá ninguna entrada hasta que "
+"esto sea solucionado por un administrador."
+
+#: html/main.php:139
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+"Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
+
+#: html/main.php:263
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
+
+#: html/main.php:292
+#, fuzzy
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7801,31 +7853,36 @@ msgstr "La sesion no sera encriptada."
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/main.php:96
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
-"'Register globals' está activado. No se permitirá ninguna entrada hasta que "
-"esto sea solucionado por un administrador."
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que está buscando."
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-"Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Por favor elije la manera en que la sesión reaccione"
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
 
-#: html/main.php:292
-#, fuzzy
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
-"¡La generación de esta página provoca que el interprete PHP muestre algunos "
-"errores!"
+"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
+"limite' definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -7855,46 +7912,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Salir"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr "Bienvenido a la configuración de GOsa"
-
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
-msgstr ""
-"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
-"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
-"configuración funcional, efectuando las siguientes tareas: comprobar la "
-"instalación de PHP y de los módulos necesarios, luego comprobar los "
-"programas opcionales y, luego de ingresar la información necesaria para "
-"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "Ya tiene una cuenta y un grupo administrativo."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-"Para proveer de acceso administrativo total a GOsa, se necesita crear un "
-"grupo especial que contendrá los usuarios administrativos. Este programa de "
-"configuración puede ayudarle en esta tarea. Introduzca el nombre y "
-"contraseñas deseadas para crear las entradas necesarias."
-
 #: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
@@ -7913,36 +7930,27 @@ msgstr "Entrando"
 msgid "Click here to log in"
 msgstr "Pulse aquí para entrar"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que está buscando."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Por favor elije la manera en que la sesión reaccione"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
+msgstr "Bienvenido a la configuración de GOsa"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
 msgstr ""
-"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
-"limite' definido y active el uso de filtros en su lugar"
+"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
+"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
+"configuración funcional, efectuando las siguientes tareas: comprobar la "
+"instalación de PHP y de los módulos necesarios, luego comprobar los "
+"programas opcionales y, luego de ingresar la información necesaria para "
+"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
@@ -7964,20 +7972,6 @@ msgstr "Salir"
 msgid "Signed in:"
 msgstr "Entrando"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Detectado conflicto de Bloqueos"
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
-"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
-"pulsando en el botón <i>Eliminar</i>."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -7996,6 +7990,38 @@ msgstr ""
 "El paso dos busca por una colección de programas/herramientas de soporte y "
 "comprueba si tienen al menos la mínima versión necesaria."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Detectado conflicto de Bloqueos"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
+"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
+"pulsando en el botón <i>Eliminar</i>."
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr "Ya tiene una cuenta y un grupo administrativo."
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+"Para proveer de acceso administrativo total a GOsa, se necesita crear un "
+"grupo especial que contendrá los usuarios administrativos. Este programa de "
+"configuración puede ayudarle en esta tarea. Introduzca el nombre y "
+"contraseñas deseadas para crear las entradas necesarias."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -8231,6 +8257,19 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#~ msgid "Display lists containing"
+#~ msgstr "Mostrar listas que contengan"
+
+#~ msgid "Show lists containing entered numbers"
+#~ msgstr "Mostrar listas que contengan los números ya introducidos"
+
+#, fuzzy
+#~ msgid "New system"
+#~ msgstr "Borrar"
+
+#~ msgid "Display terminal(s) of user"
+#~ msgstr "Mostrar terminal(es) del usuario"
+
 #, fuzzy
 #~ msgid "Germany"
 #~ msgstr "Alemán"

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index a1f12c14438090766f086717d2f810b8241882c5..34120b364bb9ddddfa1c706dc1d9fb6ae41cf24b 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -16,6 +16,7 @@
 # translation of messages.po to
 # translation of messages.po to
 # translation of messages.po to
+# translation of messages.po to
 # translation of messages.po to Français
 # Gosa2 French Translation
 # This file is distributed under the GPL
@@ -25,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2005-08-02 20:39+0200\n"
+"PO-Revision-Date: 2005-08-12 11:26+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -67,7 +68,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -76,7 +77,7 @@ msgstr "Mail"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:713
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -91,22 +92,22 @@ msgstr "Connectivit
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:711
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:709
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -137,7 +138,7 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Options"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:507
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
 msgid "Parameter"
 msgstr "Paramètres"
 
@@ -182,7 +183,7 @@ msgstr "Importer un fichier CSV"
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:131
+#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "German"
 msgstr "Allemand"
 
@@ -210,13 +211,168 @@ msgstr "Anglais"
 msgid "Italian"
 msgstr "Italien"
 
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Ceci fait quelque chose"
+
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr ""
+"Il n'y a pas de méthode de messagerie correspondante à la méthode '%s' "
+"spécifiée dans votre fichier de configuration gosa.conf."
+
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "Pas de drapeau DESC dans le message d'absence:"
+
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Ce compte n'a pas d'extensions de messagerie."
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "Supprimer le compte de messagerie"
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"L'extension messagerie est activée pour ce compte, vous pouvez la désactiver "
+"en cliquant sur le bouton ci-dessous."
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Créer un compte de messagerie"
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"L'extension de messagerie est désactivée pour ce compte, vous pouvez "
+"l'activer en cliquant sur le bouton ci-dessous."
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid "You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
+"destinataires."
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr "Utiliser une de vos adresses comme adresse de renvoi n'a pas de sens."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
+"adresses alternatives."
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr "L'adresse entrée est déjà utilisée par un utilisateur"
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid "There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+"Il n'y a pas de serveur de messagerie valide spécifié, veuillez en ajouter "
+"un dans la configuration système."
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr "Le champ obligatoire 'Primary address' n'est pas rempli."
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
+"Principale'."
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr "L'adresse principale entrée est déjà utilisée."
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr "La valeur dans le champ 'Quota size' n'est pas valide."
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Veuillez indiquer une taille valide pour les messages devant être rejetés."
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+"Il est nécessaire d'indiquer une taille maximale des messages afin de "
+"pouvoir en rejeter certains."
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+"Vous avez activé les réglages antispam, mais aucun dossier de destination "
+"n'a été précisé."
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Adresse principale"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:703
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -251,14 +407,14 @@ msgstr "Liste des adresses de messagerie alternatives"
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -269,14 +425,14 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:660
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "Ajouter"
@@ -297,13 +453,13 @@ msgstr "Ajouter"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
 #: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:21 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -322,8 +478,7 @@ msgid "No delivery to own mailbox"
 msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
 
 #: plugins/personal/mail/generic.tpl:74
-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"
@@ -397,188 +552,29 @@ msgstr "Utiliser des scripts sieve personnalis
 msgid "disables all Mail options!"
 msgstr "désactive toutes les options de messagerie!"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Ceci fait quelque chose"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr ""
-"Il n'y a pas de méthode de messagerie correspondante à la méthode '%s' "
-"spécifiée dans votre fichier de configuration gosa.conf."
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "Pas de drapeau DESC dans le message d'absence:"
-
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "Ce compte n'a pas d'extensions de messagerie."
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "Supprimer le compte de messagerie"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"L'extension messagerie est activée pour ce compte, vous pouvez la désactiver "
-"en cliquant sur le bouton ci-dessous."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "Créer un compte de messagerie"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"L'extension de messagerie est désactivée pour ce compte, vous pouvez "
-"l'activer en cliquant sur le bouton ci-dessous."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
-"destinataires."
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr "Utiliser une de vos adresses comme adresse de renvoi n'a pas de sens."
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Vous essayez d'ajouter une adresse de messagerie non valide à la liste des "
-"adresses alternatives."
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr "L'adresse entrée est déjà utilisée par un utilisateur"
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-"Il n'y a pas de serveur de messagerie valide spécifié, veuillez en ajouter "
-"un dans la configuration système."
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr "Le champ obligatoire 'Primary address' n'est pas rempli."
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
-"Principale'."
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr "L'adresse principale entrée est déjà utilisée."
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "La valeur dans le champ 'Quota size' n'est pas valide."
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-"Veuillez indiquer une taille valide pour les messages devant être rejetés."
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-"Il est nécessaire d'indiquer une taille maximale des messages afin de "
-"pouvoir en rejeter certains."
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-"Vous avez activé les réglages antispam, mais aucun dossier de destination "
-"n'a été précisé."
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:587
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:528
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr "Terminé"
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:610
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
+msgstr "Terminé"
 
 #: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:31
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -593,24 +589,24 @@ msgstr "Termin
 #: plugins/addons/addressbook/remove.tpl:17
 #: plugins/admin/groups/class_groupManagement.inc:330
 #: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:51
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
 #: plugins/admin/departments/remove.tpl:17
 #: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:530
+#: plugins/admin/systems/class_systemManagement.inc:529
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Annuler"
@@ -667,8 +663,8 @@ msgid "Display addresses of department"
 msgstr "Afficher les adresses du département"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
@@ -701,20 +697,20 @@ msgid "User name of which addresses are shown"
 msgstr "Utilisateur dont on montre les adresses"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Mot de passe"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
@@ -776,8 +772,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -802,7 +798,7 @@ 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/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:256
+#: plugins/admin/users/class_userManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -811,7 +807,7 @@ msgstr ""
 "'Repeated new password' ne concordent pas."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:265
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Le mot de passe que vous avez entré comme 'New password' est vide."
 
@@ -829,8 +825,20 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
 #: plugins/personal/password/main.inc:89
 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: "
+
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Sélectionner les hôtes à ajouter"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Afficher les systèmes du département"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Afficher les systèmes correspondant"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -861,8 +869,7 @@ msgstr "Afficher les groupes Samba"
 #: plugins/personal/posix/posix_groups.tpl:29
 #: plugins/admin/groups/headpage.tpl:48
 msgid "Select to see groups that have applications configured"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes ayant des applications configurées"
+msgstr "Sélectionnez afin d'afficher les groupes ayant des applications configurées"
 
 #: plugins/personal/posix/posix_groups.tpl:29
 #: plugins/admin/groups/headpage.tpl:49
@@ -896,48 +903,34 @@ msgid "Display groups of department"
 msgstr "Afficher les groupes du département"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Afficher les groupes correspondant"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Expression régulière correspondant à des noms de groupe"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr "Afficher les groupes contenant des utilisateurs"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:80
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Utilisateur dont on montre les groupes"
 
 #: plugins/personal/posix/posix_shadow.tpl:5
 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:19
 #: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:225
 msgid "Password expires on"
 msgstr "Le mot de passe expirera le"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Sélectionner les hôtes à ajouter"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Afficher les systèmes du département"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Display systems matching"
-msgstr "Afficher les systèmes correspondant"
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -997,6 +990,10 @@ msgstr "Langue par d
 msgid "System trust"
 msgstr "Système de Confiance"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Paramètres unix"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1013,7 +1010,7 @@ msgstr "non configur
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:202
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
 msgid "automatic"
 msgstr "automatique"
 
@@ -1237,8 +1234,7 @@ msgstr "Le champ obligatoire 'Home directory' n'est pas renseign
 
 #: plugins/personal/posix/class_posixAccount.inc:865
 msgid "Please enter a valid path in 'Home directory' field."
-msgstr ""
-"Veuillez indiquer un chemin d'accès valide dans le champ 'Home directory'."
+msgstr "Veuillez indiquer un chemin d'accès valide dans le champ 'Home directory'."
 
 #: plugins/personal/posix/class_posixAccount.inc:873
 msgid "Value specified as 'UID' is not valid."
@@ -1276,13 +1272,11 @@ msgstr "'shadowWarning' sans 'shadowMax' n'a pas de sens."
 
 #: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
-msgstr ""
-"La valeur de 'shadowWarning' doit être inférieure à celle de 'shadowMax'."
+msgstr "La valeur de 'shadowWarning' doit être inférieure à celle de 'shadowMax'."
 
 #: plugins/personal/posix/class_posixAccount.inc:910
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
-msgstr ""
-"La valeur de 'shadowWarning' doit être supérieure à celle de 'shadowMin'."
+msgstr "La valeur de 'shadowWarning' doit être supérieure à celle de 'shadowMin'."
 
 #: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'shadowInactive' is not valid."
@@ -1294,18 +1288,13 @@ msgstr "'shadowInactive' sans 'shadowMax' n'a pas de sens."
 
 #: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
-msgstr ""
-"La valeur pour 'shadowMin' doit être inférieure à celle de 'shadowMax'."
+msgstr "La valeur pour 'shadowMin' doit être inférieure à celle de 'shadowMax'."
 
 #: plugins/personal/posix/class_posixAccount.inc:1027
 #: plugins/admin/groups/class_groupGeneric.inc:651
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Paramètres unix"
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Répertoire de l'utilisateur samba"
@@ -1332,8 +1321,7 @@ msgstr ""
 
 #: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:219
 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"
 
 #: plugins/personal/samba/samba2.tpl:60
 msgid "Temporary disable samba account"
@@ -1435,6 +1423,10 @@ msgstr "Le compte expire apr
 msgid "Allow connection from these workstations only"
 msgstr "Permet la connections depuis ces stations seulement"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Configuration Samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Sélectionner les stations à ajouter"
@@ -1447,10 +1439,6 @@ msgstr "Afficher les stations d'un d
 msgid "Display workstations matching"
 msgstr "Afficher les stations correspondantes"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Configuration Samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Aucune extension samba pour cet utilisateur."
@@ -1527,8 +1515,7 @@ msgstr "La valeur sp
 
 #: plugins/personal/samba/class_sambaAccount.inc:639
 #, php-format
-msgid ""
-"The timeout property '%s' is checked and contains invalid or no characters!"
+msgid "The timeout property '%s' is checked and contains invalid or no characters!"
 msgstr ""
 "La propriété temps d'attente '%s' est activée et contient des caractères "
 "invalides ou ne contient rien!"
@@ -1557,76 +1544,209 @@ msgstr ""
 "Erreur: Impossible d'identifier le groupe principal de l'utilisateur - la "
 "transformation vers un groupe samba est impossible!"
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"Vous avez sélectionnez une autre méthode de stockage des mots de passe. Pour "
-"cette raison vous devez ressaisir votre mot de passe afin que GOsa puisse le "
-"réencoder et l'enregistrer dans l'annuaire LDAP."
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "féminin"
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Image personnelle"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "masculin"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Suppression de l'image personnelle"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Ce compte n'a pas d'extensions GOsa valides."
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Enregistrer"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr "Ce fichier n'a pas été téléchargé via la méthode HTTP POST! Abandon."
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Informations personnelles"
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr "Veuillez entrer un numéro de série valide"
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
-msgstr "Changer la photo"
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid "Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
+"Le certificat est valide de <b>%s</b> à <b>%s</b> et est actuellement <b>%s</"
+"b>."
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
-msgid "Name"
-msgstr "Nom"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr "valide"
 
-#: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:23
-msgid "Given name"
-msgstr "Prénom"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr "invalide"
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
-msgid "Login"
-msgstr "Identifiant"
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
+msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
-msgstr "Titre Personnel"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr "La communication vers la base de données kerberos a échoué"
 
-#: plugins/personal/generic/generic.tpl:50
-msgid "Academic title"
-msgstr "Titre Universitaire"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr "Impossible de supprimer l'utilisateur de la base de données kerberos."
 
-#: plugins/personal/generic/generic.tpl:58
-msgid "Date of birth"
-msgstr "Date de naissance"
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr "Impossible d'ajouter un utilisateur à la base de données kerberos."
 
-#: plugins/personal/generic/generic.tpl:75
-#: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
-msgid "Set"
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+"Vous n'avez pas l'autorisation pour déplacer un utilisateur sur depuis cette "
+"'Base'."
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:528
+msgid "The required field 'Name' is not set."
+msgstr "Le champ obligatoire 'Name' n'est pas rempli."
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr "Une personne ayant ce 'Login' existe déjà dans l'annuaire."
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "The required field 'Given name' is not set."
+msgstr "Le champ obligatoire 'Given name' n'est pas rempli."
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr "Le champ obligatoire 'Login' n'est pas renseigné."
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr "Une personne ayant ce 'Name'/'Given name' existe déjà dans l'annuaire."
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Le champ 'Login' contient des caractères invalides. Les minuscules, chiffres "
+"et tirets sont autorisés."
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Le champ 'Homepage' contient une URL invalide."
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr "Le champ 'Name' contient des caractères invalides."
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Le champ 'Given name' contient des caractères invalides."
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Le champ 'Phone' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Le champ 'Fax' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Le champ 'Mobile' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Le champ 'Pager' contient un numéro invalide."
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr "Impossible d'ouvrir le certificat demandé!"
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Vous avez sélectionnez une autre méthode de stockage des mots de passe. Pour "
+"cette raison vous devez ressaisir votre mot de passe afin que GOsa puisse le "
+"réencoder et l'enregistrer dans l'annuaire LDAP."
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Informations personnelles"
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Image personnelle"
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr "Changer la photo"
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+msgid "Name"
+msgstr "Nom"
+
+#: plugins/personal/generic/generic.tpl:30
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:23
+msgid "Given name"
+msgstr "Prénom"
+
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+msgid "Login"
+msgstr "Identifiant"
+
+#: plugins/personal/generic/generic.tpl:42
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
+msgstr "Titre Personnel"
+
+#: plugins/personal/generic/generic.tpl:50
+msgid "Academic title"
+msgstr "Titre Universitaire"
+
+#: plugins/personal/generic/generic.tpl:58
+msgid "Date of birth"
+msgstr "Date de naissance"
+
+#: plugins/personal/generic/generic.tpl:75
+#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14
+msgid "Set"
 msgstr "Rempli"
 
 #: plugins/personal/generic/generic.tpl:81
@@ -1702,9 +1822,9 @@ msgstr "Entreprise"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1730,8 +1850,8 @@ msgid "Room No."
 msgstr "No. de bureau."
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Portable"
@@ -1808,6 +1928,15 @@ msgstr "Derni
 msgid "Public visible"
 msgstr "Visible par tous"
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Suppression de l'image personnelle"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Enregistrer"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificat standard"
@@ -1818,7 +1947,7 @@ msgstr "Certificat standard"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Supprimer"
@@ -1835,181 +1964,126 @@ msgstr "Certificat PKCS12"
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr "féminin"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "Vous n'êtes pas autorisé à modifier votre mot de passe!"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr "masculin"
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Information générales sur l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr "Ce compte n'a pas d'extensions GOsa valides."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr "Ce fichier n'a pas été téléchargé via la méthode HTTP POST! Abandon."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "La valeur spécifiée dans le champ 'Upload bandwidth' n'est pas valide."
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr "Veuillez entrer un numéro de série valide"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "La valeur spécifiée dans le champ 'Download bandwidth' n'est pas valide."
 
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
-"Le certificat est valide de <b>%s</b> à <b>%s</b> et est actuellement <b>%s</"
-"b>."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "La valeur spécifiée dans le champ 'Files' n'est pas valide."
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr "valide"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "La valeur spécifiée dans le champ 'Size' est invalide."
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr "invalide"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "La valeur spécifiée dans le champ 'Ratio' n'est pas valide."
 
-#: plugins/personal/generic/class_user.inc:408
-msgid "No certificate installed"
-msgstr "Pas de certificat installé"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr "La communication vers la base de données kerberos a échoué"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Compte Proxy"
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr "Impossible de supprimer l'utilisateur de la base de données kerberos."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr "Filtrer le contenu non désiré (i.e. pornographique ou violent)"
 
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr "Impossible d'ajouter un utilisateur à la base de données kerberos."
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Accès au proxy autorisé durant la plage horaire suivante"
 
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Restreindre la quantité de données téléchargeables"
 
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation pour déplacer un utilisateur sur depuis cette "
-"'Base'."
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "par"
 
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:505
-msgid "The required field 'Name' is not set."
-msgstr "Le champ obligatoire 'Name' n'est pas rempli."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr "Kolab"
 
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
-msgstr "Une personne ayant ce 'Login' existe déjà dans l'annuaire."
-
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:508
-msgid "The required field 'Given name' is not set."
-msgstr "Le champ obligatoire 'Given name' n'est pas rempli."
-
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
-msgstr "Le champ obligatoire 'Login' n'est pas renseigné."
-
-#: plugins/personal/generic/class_user.inc:912
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr "Une personne ayant ce 'Name'/'Given name' existe déjà dans l'annuaire."
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
+msgid "You're trying to add an invalid email address to the list of delegations."
+msgstr ""
+"Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
+"délégations."
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
-"Le champ 'Login' contient des caractères invalides. Les minuscules, chiffres "
-"et tirets sont autorisés."
-
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Le champ 'Homepage' contient une URL invalide."
-
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
-msgstr "Le champ 'Name' contient des caractères invalides."
-
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Le champ 'Given name' contient des caractères invalides."
-
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Le champ 'Phone' contient un numéro invalide."
-
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Le champ 'Fax' contient un numéro invalide."
-
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Le champ 'Mobile' contient un numéro invalide."
+"L'adresse de messagerie que vous essayez de rajouter n'est pas l'adresse "
+"primaire d'un utilisateur existant."
 
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Le champ 'Pager' contient un numéro invalide."
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr "Toujours accepter"
 
-#: plugins/personal/generic/class_user.inc:1070
-msgid "Could not open specified certificate!"
-msgstr "Impossible d'ouvrir le certificat demandé!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr "Toujours rejeter"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "Vous n'êtes pas autorisé à modifier votre mot de passe!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr "Reconnexion si il y a conflit"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Information générales sur l'utilisateur"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr "Manuel si il y a conflit"
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Compte Proxy"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr "Manuel"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Filtrer le contenu non désiré (i.e. pornographique ou violent)"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr "Anonyme"
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Accès au proxy autorisé durant la plage horaire suivante"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr ""
+"La valeur spécifiée comme information de disponibilité future doit être un "
+"entier."
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Restreindre la quantité de données téléchargeables"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr "La valeur spécifiée comme URL d'information de disponibilité est invalide."
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "par"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr "La politique d'invitation pour l'adresse '%s' n'est pas valide."
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
-msgstr "Créer un compte Intranet"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
+"Il n'y a pas d'utilisateur avec l'adresse de messagerie '%s' pour votre "
+"politique d'invitation!"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -2065,6 +2139,49 @@ msgstr "jours"
 msgid "Invitation policy"
 msgstr "Politique d'invitation"
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Compte WebDAV"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Ce compte à les extensions <b>OpenXchange</b> désactivées. La création d'un "
+"compte OpenXchange nécessite, au préalable, que l'utilisateur possède un "
+"compte Posix."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Ce compte à les extensions <b>OpenXchange</b> désactivées. La création d'un "
+"compte OpenXchange nécessite, au préalable, que l'utilisateur possède un "
+"compte de messagerie."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr "Impossible de se connecter a la base de données Postgresql"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+"Les paramètres nécessaires à l'extension openexchange ne sont pas "
+"disponibles!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr "Le module PHP4 pour Postgresql ne fonctionne pas!"
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "Compte FTP"
@@ -2146,6 +2263,14 @@ msgstr "Information Utilisateur"
 msgid "User Timezone"
 msgstr "Zone Horaire de l'utilisateur"
 
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr "Créer un compte Intranet"
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "Ce compte n'as pas d'extension de connectivité."
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2187,148 +2312,62 @@ msgstr "La valeur dans le champ 'Quota Setting' n'est pas valide."
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr "Kolab"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Liste des noms"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
-msgstr ""
-"Vous essayez d'ajouter une adresse de messagerie invalide à la liste des "
-"délégations."
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Nom de la liste rouge"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr ""
-"L'adresse de messagerie que vous essayez de rajouter n'est pas l'adresse "
-"primaire d'un utilisateur existant."
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Sélectionnez la branche où sera situé la liste rouge"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr "Toujours accepter"
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
+msgstr "Type"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr "Toujours rejeter"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr "Reconnexion si il y a conflit"
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
+msgstr "Description"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr "Manuel si il y a conflit"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Texte descriptif pour cette liste rouge"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Manuel"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Numéros bloqués"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anonyme"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr ""
-"La valeur spécifiée comme information de disponibilité future doit être un "
-"entier."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr ""
-"La valeur spécifiée comme URL d'information de disponibilité est invalide."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr "La politique d'invitation pour l'adresse '%s' n'est pas valide."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
-msgstr ""
-"Il n'y a pas d'utilisateur avec l'adresse de messagerie '%s' pour votre "
-"politique d'invitation!"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "La valeur spécifiée dans le champ 'Upload bandwidth' n'est pas valide."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr ""
-"La valeur spécifiée dans le champ 'Download bandwidth' n'est pas valide."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr "La valeur spécifiée dans le champ 'Files' n'est pas valide."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
-msgstr "La valeur spécifiée dans le champ 'Size' est invalide."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "La valeur spécifiée dans le champ 'Ratio' n'est pas valide."
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Compte WebDAV"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Ce compte à les extensions <b>OpenXchange</b> désactivées. La création d'un "
-"compte OpenXchange nécessite, au préalable, que l'utilisateur possède un "
-"compte Posix."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Ce compte à les extensions <b>OpenXchange</b> désactivées. La création d'un "
-"compte OpenXchange nécessite, au préalable, que l'utilisateur possède un "
-"compte de messagerie."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
-msgstr "Impossible de se connecter a la base de données Postgresql"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-"Les paramètres nécessaires à l'extension openexchange ne sont pas "
-"disponibles!"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr "Le module PHP4 pour Postgresql ne fonctionne pas!"
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+msgid "Information"
+msgstr "Information"
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
-msgstr "Ce compte n'as pas d'extension de connectivité."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
+msgstr "Les nombres peuvent contenir des jokers."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
@@ -2349,10 +2388,10 @@ msgstr "Veuillez entrer un num
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Go up one department"
@@ -2360,10 +2399,10 @@ msgstr "Monter d'un d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
@@ -2372,10 +2411,10 @@ msgstr "Au dessus"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:357
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 msgid "Go to root department"
@@ -2383,10 +2422,10 @@ msgstr "Aller au d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 msgid "Root"
@@ -2394,9 +2433,9 @@ msgstr "Racine"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2405,10 +2444,10 @@ msgstr "Aller au d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 msgid "Home"
@@ -2424,10 +2463,10 @@ msgstr "Nouvelle liste rouge"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 msgid "Current base"
@@ -2435,10 +2474,10 @@ msgstr "Base actuelle"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit department"
@@ -2446,10 +2485,10 @@ msgstr "Soumettre le d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit"
@@ -2457,34 +2496,34 @@ msgstr "Soumettre"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "edit"
 msgstr "editer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr "Editer un utilisateur"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "delete"
 msgstr "supprimer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr "Supprimer un utilisateur"
@@ -2496,10 +2535,10 @@ msgstr "Nom de la liste rouge"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/class_systemManagement.inc:578
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Actions"
@@ -2519,8 +2558,7 @@ msgstr "recevoir"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:526
 msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:532
 #: plugins/admin/departments/class_departmentGeneric.inc:147
@@ -2537,66 +2575,7 @@ msgstr "Le nom sp
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:550
 msgid "No permission to create a blocklist on this base."
-msgstr ""
-"Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
-
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Liste des noms"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nom de la liste rouge"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Sélectionnez la branche où sera situé la liste rouge"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr "Type"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-"Veuillez sélectionner si il faut filtrer sur les appels entrants ou sortants"
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr "Description"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Texte descriptif pour cette liste rouge"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Numéros bloqués"
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-msgid "Information"
-msgstr "Information"
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr "Les nombres peuvent contenir des jokers."
+msgstr "Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
 
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
@@ -2659,22 +2638,14 @@ msgstr "S
 msgid "Show receive blocklists"
 msgstr "Afficher les listes rouges de correspondants"
 
-#: plugins/gofax/blocklists/headpage.tpl:48
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr "Afficher les listes correspondantes"
 
-#: plugins/gofax/blocklists/headpage.tpl:51
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr "Expression régulière pour trouver des listes correspondantes"
 
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr "Afficher les listes contenant"
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr "Afficher les listes contenant les numéros entrés"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Configuration des listes rouges"
@@ -2783,8 +2754,8 @@ msgid "List of predefined blocklists"
 msgstr "Liste des listes rouges prédéfinies"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -2841,8 +2812,7 @@ msgstr "Veuillez entrer un num
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
 msgid "Mail delivery is checked, but no address has been specified."
-msgstr ""
-"La livraison par messagerie est activée, mais aucune adresse est spécifiée."
+msgstr "La livraison par messagerie est activée, mais aucune adresse est spécifiée."
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
 msgid "The mail address you've entered is invalid."
@@ -2905,41 +2875,6 @@ msgstr "Temps de transfert"
 msgid "# pages"
 msgstr "# pages"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Rapports des Fax"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Impossible de se connecter à la base de données des fax, aucun rapport ne "
-"peut être affiché!"
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"Impossible de sélectionner la base de données fax pour la génération de "
-"rapports!"
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr "La requête sur la base de données des fax a échoué!"
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"Vous n'avez pas l'autorisation de récupérer les informations à propos de "
-"l'identifiant de ce fax!"
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr "A-M-J"
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2994,67 +2929,51 @@ msgstr "Correspondant"
 msgid "Search returned no results..."
 msgstr "La recherche n'a renvoyé aucun résultat..."
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Rapports des Fax"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Appel en cours ..."
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Impossible de se connecter à la base de données des fax, aucun rapport ne "
+"peut être affiché!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
-msgid "Dial"
-msgstr "Appeler"
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"Impossible de sélectionner la base de données fax pour la génération de "
+"rapports!"
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Choisissez le département où l'entrée sera stockée"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
+msgstr "La requête sur la base de données des fax a échoué!"
 
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Personnel"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"Vous n'avez pas l'autorisation de récupérer les informations à propos de "
+"l'identifiant de ce fax!"
 
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Initiales"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr "A-M-J"
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Rapports des Fax"
 
-#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privé"
 
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Adresse de messagerie"
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Organisation"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Société"
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Ville"
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Pays"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Contact"
@@ -3092,8 +3011,7 @@ msgstr "Afficher les entr
 
 #: plugins/addons/addressbook/contents.tpl:69
 msgid "Select to see users in addressbook"
-msgstr ""
-"Sélectionner pour afficher les utilisateurs présent dans le carnet d'adresse"
+msgstr "Sélectionner pour afficher les utilisateurs présent dans le carnet d'adresse"
 
 #: plugins/addons/addressbook/contents.tpl:69
 msgid "Show addressbook entries"
@@ -3115,6 +3033,57 @@ msgstr "Indiquez l'objet dans lequel la recherche sera effectu
 msgid "Search string"
 msgstr "Phrase de recherche"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Appel en cours ..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr "Appeler"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Choisissez le département où l'entrée sera stockée"
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personnel"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Initiales"
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "Adresse de messagerie"
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Organisation"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Société"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Ville"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Pays"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3207,15 +3176,13 @@ msgid "User ID"
 msgstr "ID de l'utilisateur"
 
 #: plugins/addons/addressbook/class_addressbook.inc:578
-msgid ""
-"Cannot create a unique DN for your entry. Please fill more formular fields."
+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."
 
 #: plugins/addons/addressbook/class_addressbook.inc:590
-msgid ""
-"You have no permissions to create or modify a global address book entry."
+msgid "You have no permissions to create or modify a global address book entry."
 msgstr ""
 "Vous n'avez pas les droits nécessaires pour créer ou modifier une entrée "
 "dans le carnet d'adresse général."
@@ -3227,8 +3194,7 @@ msgstr "Exportation LDIF"
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:93
 msgid "You've no permission to do CSV imports."
-msgstr ""
-"Vous n'avez pas les droits nécessaires pour effectuer des importations CSV."
+msgstr "Vous n'avez pas les droits nécessaires pour effectuer des importations CSV."
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:154
 msgid "Need 'sn','givenName' and 'uid' to create user."
@@ -3346,8 +3312,7 @@ msgstr "S
 
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
-msgstr ""
-"Vous n'avez pas les droits nécessaires pour effectuer des importations LDAP."
+msgstr "Vous n'avez pas les droits nécessaires pour effectuer des importations LDAP."
 
 #: plugins/addons/ldapmanager/class_import.inc:105
 msgid "Unknown Error"
@@ -3404,8 +3369,7 @@ msgstr "Importer un fichier CSV"
 
 #: plugins/addons/ldapmanager/class_export.inc:35
 msgid "You've no permission to do LDAP exports."
-msgstr ""
-"Vous n'avez pas les droits nécessaires pour effectuer des exportations LDAP."
+msgstr "Vous n'avez pas les droits nécessaires pour effectuer des exportations LDAP."
 
 #: plugins/addons/ldapmanager/class_export.inc:80
 msgid "Error while exporting the requested entries!"
@@ -3506,14 +3470,62 @@ msgstr "Message"
 msgid "System log view"
 msgstr "Affichage des logs système"
 
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr ""
+"Impossible de trouver le SID de ce groupe dans l'annuaire LDAP ou dans le "
+"fichier de configuration!"
+
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
+msgstr "Ce 'dn' n'est pas un groupe."
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
+msgstr "Groupe Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
+msgstr "Administrateurs du domaine"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
+msgstr "Utilisateurs du domaine"
+
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
+msgstr "Invités du domaine"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
+msgstr "Groupe spécial (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
+
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Le champ 'Name' contient des caractères invalides. Minuscule, chiffre et "
+"tirets sont valides."
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr "La valeur spécifiée dans le champs 'Name' existe déjà."
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr "Adresse de messagerie principale pour ce répertoire partagé"
 
 #: plugins/admin/groups/mail.tpl:16
 msgid "Select mail server to place user on"
-msgstr ""
-"Sélectionner le serveur de messagerie sur lequel sera créé l'utilisateur"
+msgstr "Sélectionner le serveur de messagerie sur lequel sera créé l'utilisateur"
 
 #: plugins/admin/groups/mail.tpl:66
 msgid "IMAP shared folders"
@@ -3531,6 +3543,24 @@ msgstr "Permission des membres"
 msgid "Forward messages to non group members"
 msgstr "Transférer les messages vers un membre n'appartenant pas au groupe"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Liste des groupes"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Ce menu permet d'ajouter, de modifier ou de supprimer les groupes "
+"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
+"travaillez avec un nombre élevé de groupes."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Administration du groupe"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3570,7 +3600,7 @@ msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:705
 msgid "Posix"
 msgstr "Posix"
 
@@ -3587,7 +3617,7 @@ msgid "Groupname"
 msgstr "Nom du groupe"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:645
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3601,55 +3631,6 @@ msgstr "Propri
 msgid "This table displays all groups, in the selected tree."
 msgstr "Ce tableau montre tous les groupes, dans l'arbre sélectionné."
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-"Impossible de trouver le SID de ce groupe dans l'annuaire LDAP ou dans le "
-"fichier de configuration!"
-
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
-msgstr "Ce 'dn' n'est pas un groupe."
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Groupe Samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Administrateurs du domaine"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Utilisateurs du domaine"
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Invités du domaine"
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr "Groupe spécial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Le champ 'Name' contient des caractères invalides. Minuscule, chiffre et "
-"tirets sont valides."
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr "La valeur spécifiée dans le champs 'Name' existe déjà."
-
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -3660,23 +3641,9 @@ msgstr ""
 "seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
 "données."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Administration du groupe"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Liste des groupes"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Ce menu permet d'ajouter, de modifier ou de supprimer les groupes "
-"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
-"travaillez avec un nombre élevé de groupes."
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Options des applications"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3717,8 +3684,7 @@ msgstr ""
 "address'."
 
 #: plugins/admin/groups/class_groupMail.inc:646
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+msgid "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 "Veuillez choisir des permissions valables. Les permissions par défaut ne "
 "peuvent pas être vides."
@@ -3760,7 +3726,7 @@ msgid "Display users of department"
 msgstr "Afficher les utilisateurs du département"
 
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:48
 msgid "Display users matching"
 msgstr "Afficher les utilisateurs correspondants"
 
@@ -3827,10 +3793,6 @@ msgstr "Membre du groupe"
 msgid "Folder administrators"
 msgstr "Administrateurs du répertoire"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Options des applications"
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr "Ce 'dn' n'est pas un groupe d'applications."
@@ -3861,8 +3823,7 @@ msgstr ""
 
 #: plugins/admin/groups/class_groupApplication.inc:107
 msgid "The selected application name is not uniq. Please check your LDAP."
-msgstr ""
-"Le nom de l'application n'est pas unique. Veuillez vérifier l'annuaire LDAP."
+msgstr "Le nom de l'application n'est pas unique. Veuillez vérifier l'annuaire LDAP."
 
 #: plugins/admin/groups/class_groupApplication.inc:143
 msgid "The selected application has no options."
@@ -3883,133 +3844,146 @@ msgstr ""
 "Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
 "mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: plugins/admin/users/class_userManagement.inc:239
-#: plugins/admin/users/class_userManagement.inc:290
-msgid "You are not allowed to set this users password!"
-msgstr ""
-"Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Créer un nouvel utilisateur à partir d'un modèle"
 
-#: plugins/admin/users/class_userManagement.inc:326
-#, php-format
-msgid "You're about to delete the user %s."
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+"La création d'un nouvel utilisateur peut être facilité en utilisant les "
+"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
+"Sélectionnez <b>aucun</b> afin de ne pas utiliser les modèles."
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Modèle"
+
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Continuer"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administration des utilisateurs"
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:313
+msgid "You are not allowed to set this users password!"
+msgstr "Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
+
+#: plugins/admin/users/class_userManagement.inc:349
+#, php-format
+msgid "You're about to delete the user %s."
 msgstr "Vous êtes sur le point de supprimer l'utilisateur %s."
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:355
+#: plugins/admin/users/class_userManagement.inc:383
 msgid "You are not allowed to delete this user!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
 
-#: plugins/admin/users/class_userManagement.inc:450
+#: plugins/admin/users/class_userManagement.inc:473
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Une personne ayant ce nom existe déjà dans l'annuaire."
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 msgid "Create new user"
 msgstr "Création d'un nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "Create new template"
 msgstr "Créer un nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:672
 msgid "This table displays all users, in the selected tree."
 msgstr "Ce tableau montre toutes les utilisateurs, dans l'arbre sélectionné."
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:703
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:682
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "Edit generic properties"
-msgstr "Modifier les propriétés"
+msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:683
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:706
 msgid "Edit UNIX properties"
-msgstr "Modifier les propriétés"
+msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:684
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:708
 msgid "Edit mail properties"
-msgstr "Modifier les propriétés"
+msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_userManagement.inc:685
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:710
 msgid "Edit phone properties"
-msgstr "Modifier les propriétés"
+msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_userManagement.inc:686
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:712
 msgid "Edit fax properies"
-msgstr "Modifier les propriétés"
+msgstr "Modifier les propriétés fax"
 
-#: plugins/admin/users/class_userManagement.inc:687
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:714
 msgid "Edit samba properties"
-msgstr "Modifier les propriétés"
+msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_userManagement.inc:868
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
-msgid "Template"
-msgstr "Modèle"
+#: plugins/admin/users/class_userManagement.inc:715
+msgid "Create user from template"
+msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Créer un nouvel utilisateur à partir d'un modèle"
+#: plugins/admin/users/class_userManagement.inc:716
+msgid "Create user with this template"
+msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-msgstr ""
-"La création d'un nouvel utilisateur peut être facilité en utilisant les "
-"modèles. De nombreuses informations seront ainsi remplies automatiquement. "
-"Sélectionnez <b>aucun</b> afin de ne pas utiliser les modèles."
+#: plugins/admin/users/class_userManagement.inc:771
+msgid "Online"
+msgstr "en ligne"
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Continuer"
+#: plugins/admin/users/class_userManagement.inc:778
+msgid "Offline"
+msgstr "hors-ligne"
 
 #: plugins/admin/users/remove.tpl:7
 msgid ""
@@ -4046,8 +4020,7 @@ msgstr "Afficher les mod
 
 #: plugins/admin/users/headpage.tpl:39
 msgid "Select to see users that have only a GOsa object"
-msgstr ""
-"Sélectionnez afin d'afficher les utilisateurs qui ont seulement un objet GOsa"
+msgstr "Sélectionnez afin d'afficher les utilisateurs qui ont seulement un objet GOsa"
 
 #: plugins/admin/users/headpage.tpl:39
 msgid "Show functional users"
@@ -4063,8 +4036,7 @@ msgstr "Afficher les utilisateurs Unix"
 
 #: plugins/admin/users/headpage.tpl:41
 msgid "Select to see users that have mail settings"
-msgstr ""
-"Sélectionnez afin d'afficher les utilisateurs ayant un compte de messagerie"
+msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte de messagerie"
 
 #: plugins/admin/users/headpage.tpl:41
 msgid "Show mail users"
@@ -4086,49 +4058,6 @@ msgstr "S
 msgid "Show proxy users"
 msgstr "Afficher les utilisateurs proxy"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administration des utilisateurs"
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Supprimer les options"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Cette application a des options. Vous pouvez les désactiver en cliquant sur "
-"le bouton ci-dessous."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Créer des options"
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Cette application a des options désactivées. Vous pouvez les activer en "
-"cliquant en-dessous."
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valeur par défaut"
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Ajouter une option"
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "La valeur '%s' spécifiée pour le nom de l'option est invalide."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -4189,6 +4118,44 @@ msgstr "Placer une ic
 msgid "Place entry in members startmenu"
 msgstr "Placer une entrée dans le menu démarrage des membres"
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Supprimer les options"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Cette application a des options. Vous pouvez les désactiver en cliquant sur "
+"le bouton ci-dessous."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Créer des options"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid "This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Cette application a des options désactivées. Vous pouvez les activer en "
+"cliquant en-dessous."
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valeur par défaut"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Ajouter une option"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "La valeur '%s' spécifiée pour le nom de l'option est invalide."
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -4226,6 +4193,25 @@ msgstr "Expression r
 msgid "Application management"
 msgstr "Gestion des applications"
 
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Vous êtes sur le point de supprimer l'application '%s'."
+
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
+msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "new"
+msgstr "nouveau"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+msgid "Create new application"
+msgstr "Créer une nouvelle application"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr "Ce 'dn' n'est pas une application."
@@ -4252,25 +4238,6 @@ msgstr "Le champ obligatoire 'Execute' n'est pas rempli."
 msgid "There's already an application with this 'Name'."
 msgstr "Une application ayant le même 'Name' existe déjà."
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Vous êtes sur le point de supprimer l'application '%s'."
-
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
-msgid "You are not allowed to delete this application!"
-msgstr "Vous n'êtes pas autorisé à supprimer cette application!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "new"
-msgstr "nouveau"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-msgid "Create new application"
-msgstr "Créer une nouvelle application"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nom du département"
@@ -4353,11 +4320,10 @@ msgstr ""
 "d'utiliser les filtres."
 
 #: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Afficher les départements correspondants"
 
-#: plugins/admin/departments/headpage.tpl:45
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr "Expression régulière pour faire correspondre le nom des applications"
 
@@ -4365,28 +4331,6 @@ msgstr "Expression r
 msgid "Department management"
 msgstr "Gestion des départements"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr "Un département ayant ce 'Name' existe déjà."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
-msgstr "Le champ obligatoire 'Description' n'est pas rempli."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Le champ 'Name' contient le mot réservé 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr " Veuillez choisir un autre nom."
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4428,6 +4372,27 @@ msgstr "d
 msgid ".."
 msgstr ".."
 
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr "Un département ayant ce 'Name' existe déjà."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr "Le champ obligatoire 'Description' n'est pas rempli."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "Le champ 'Name' contient le mot réservé 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
+msgstr " Veuillez choisir un autre nom."
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4476,6 +4441,12 @@ msgstr "Adresse IP"
 msgid "MAC-address"
 msgstr "Adresse MAC"
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+"Serveur de terminaux, le chemin vers les polices de caractère doit être "
+"spécifié."
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
@@ -4598,9 +4569,45 @@ msgstr "Service Son"
 msgid "GUI"
 msgstr "Interface graphique"
 
-#: plugins/admin/systems/class_terminalService.inc:83
-msgid "default"
-msgstr "défaut"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Administration du système"
+
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "Exportation Nfs"
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Services de temps"
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Service LDAP"
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Services de terminaux"
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Désactiver temporairement le login"
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Répertoire des polices de caractères"
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Service de logs systèmes"
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Services d'impression"
+
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "default"
+msgstr "défaut"
 
 #: plugins/admin/systems/class_terminalService.inc:84
 msgid "show chooser"
@@ -4640,47 +4647,28 @@ msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
 "Horizontale."
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Administration du système"
-
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-"Serveur de terminaux, le chemin vers les polices de caractère doit être "
-"spécifié."
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "Exportation Nfs"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Services de temps"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Service LDAP"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Services de terminaux"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Désactiver temporairement le login"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "La valeur '%s' est vide ou contient des caractères invalides."
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Répertoire des polices de caractères"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "La chaîne de connexion imap doit être de la forme '%s'."
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Service de logs systèmes"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "Le port sieve doit être numérique."
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Services d'impression"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La chaîne de connexion imap doit être un nom d'hôte ou une adresse IP."
 
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
@@ -4704,6 +4692,74 @@ msgstr "Action"
 msgid "Select action to execute for this server"
 msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Nom du téléphone"
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Modèle de terminaux"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Nom du terminal"
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr "Mode"
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Sélectionnez le mode du terminal"
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Serveur Primaire"
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Sélectionnez le système de fichier root NFS à utiliser"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Serveur de Swap"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Serveur de logs systèmes"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Sélectionnez le serveur de logs à utiliser"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "Serveur NTP"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr "Sélectionnez le serveur pour la synchronisation du temps"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Sélectionnez l'opération à exécuter sur le terminal"
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4780,10 +4836,6 @@ msgstr "Vous n'avez pas l'autorisation de cr
 msgid "The required field 'Terminal name' is not set."
 msgstr "Le champ obligatoire 'Terminal name' n'est pas renseigné."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Nom du téléphone"
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Ce 'dn' n'a pas d'options serveur."
@@ -4796,70 +4848,6 @@ msgstr "Le champ obligatoire 'Server name' n'est pas rempli."
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation pour créer un serveur sur cette 'Base'."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Modèle de terminaux"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nom du terminal"
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr "Mode"
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Sélectionnez le mode du terminal"
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Serveur Primaire"
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr "Sélectionnez le système de fichier root NFS à utiliser"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Serveur de Swap"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Sélectionnez le système de fichier NFS où sera placé le swap"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Serveur de logs systèmes"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Sélectionnez le serveur de logs à utiliser"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Serveur NTP"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr "Sélectionnez le serveur pour la synchronisation du temps"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Sélectionnez l'opération à exécuter sur le terminal"
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Suppression du service DHCP"
@@ -4884,6 +4872,18 @@ msgstr ""
 "Ce serveur à l'option DHCP désactivé. Vous pouvez l'activer en cliquant sur "
 "le bouton ci-dessous."
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Nom de l'imprimante"
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "URL de l'imprimante"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Chemin d'accès aux PPD"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
@@ -4902,192 +4902,174 @@ msgstr "Le champ obligatoire 'Workstation name' n'est pas renseign
 msgid "Systems"
 msgstr "Systèmes"
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr "Impossible d'éditer ce type d'objet pour le moment!"
 
-#: plugins/admin/systems/class_systemManagement.inc:339
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 "Le mot de passe entré dans le champ nouveau et celui dans le champ "
 "vérification ne concordent pas!"
 
-#: plugins/admin/systems/class_systemManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr "Vous n'êtes pas autorisé à modifier ce mot de passe de ce système!"
 
-#: plugins/admin/systems/class_systemManagement.inc:396
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Vous êtes sur le point de supprimer toute les informations relatives aux "
 "composant '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:402
-#: plugins/admin/systems/class_systemManagement.inc:466
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 msgid "You are not allowed to delete this component!"
 msgstr "Vous n'êtes pas autorisé à supprimer ce composant!"
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
 msgid "New Terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
 msgid "New Workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
-#, fuzzy
+#: plugins/admin/systems/class_systemManagement.inc:559
 msgid "New Server"
-msgstr "Serveur NFS"
+msgstr "Nouveau Serveur"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
-#, fuzzy
+#: plugins/admin/systems/class_systemManagement.inc:560
 msgid "New Printer"
-msgstr "Imprimante"
+msgstr "Nouvelle Imprimante"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
-#, fuzzy
+#: plugins/admin/systems/class_systemManagement.inc:561
 msgid "New Phone"
-msgstr "Téléphone"
+msgstr "Nouveau Téléphone"
 
-#: plugins/admin/systems/class_systemManagement.inc:563
-#, fuzzy
+#: plugins/admin/systems/class_systemManagement.inc:562
 msgid "New Component"
-msgstr "Autre composant réseau"
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr "Créer un nouveau système"
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-#, fuzzy
-msgid "New system"
-msgstr "Effacer un système"
+msgstr "Nouveau composant"
 
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "Edit system"
 msgstr "Editer un système"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "Delete system"
 msgstr "Effacer un système"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 msgid "System"
 msgstr "Système"
 
-#: plugins/admin/systems/class_systemManagement.inc:584
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "This table displays all systems, in the selected tree."
 msgstr "Ce tableau montre toutes les systèmes, dans l'arbre sélectionné."
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 msgid "Cups Server"
 msgstr "Serveur Cups"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr "Base de données de logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 msgid "Syslog Server"
 msgstr "Serveur de logs systèmes"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 msgid "Mail Server"
 msgstr "Serveur de messagerie"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 msgid "Imap Server"
 msgstr "Serveur Imap"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 msgid "Nfs Server"
 msgstr "Serveur NFS"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 msgid "Kerberos Server"
 msgstr "Serveur Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 msgid "Asterisk Server"
 msgstr "Serveur Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 msgid "Fax Server"
 msgstr "Serveur de Fax"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 msgid "Ldap Server"
 msgstr "Serveur Ldap"
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 msgid "Set root password"
 msgstr "Indiquez le mot de passe administrateur"
 
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:700
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:701
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Stations de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 msgid "Winstation"
 msgstr "Stations Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 msgid "Network Device"
 msgstr "Périphérique réseau"
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
 #: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Imprimante"
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr "Nouveau terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr "Nouvelle station de travail"
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 msgid "Terminal template for"
 msgstr "Modèle de terminal pour "
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr "Modèle de station de travail pour"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Nom de l'imprimante"
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "URL de l'imprimante"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Ce 'dn' n'a pas d'extensions d'impression."
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Chemin d'accès aux PPD"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
 msgstr "Suppression du service DNS"
 
 #: plugins/admin/systems/class_servDNS.inc:34
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+msgid "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 "Ce serveur à l'option DNS activée. Vous pouvez le désactiver en cliquant sur "
 "le bouton ci-dessous."
@@ -5097,35 +5079,11 @@ msgid "Add DNS service"
 msgstr "Ajouter un service DNS"
 
 #: plugins/admin/systems/class_servDNS.inc:37
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+msgid "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 "Ce serveur à l'option DNS désactivé. Vous pouvez l'activer en cliquant sur "
 "le bouton ci-dessous."
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "La valeur '%s' est vide ou contient des caractères invalides."
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "La chaîne de connexion imap doit être de la forme '%s'."
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr "Le port sieve doit être numérique."
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La chaîne de connexion imap doit être un nom d'hôte ou une adresse IP."
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Modèle de station de travail"
@@ -5260,15 +5218,6 @@ msgstr "pas de r
 msgid "No SMTP smarthost/relayhost set."
 msgstr "Pas de relais SMTP indiqué."
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Ce 'dn' n'a pas d'extensions d'impression."
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
-
 #: plugins/admin/systems/servkolab.tpl:14
 msgid "POP3 service"
 msgstr "Service POP3"
@@ -5347,85 +5296,7 @@ msgstr "Accepter le courrier 
 
 #: plugins/admin/systems/servkolab.tpl:169
 msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr ""
-"Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
-
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
-msgstr "Configuration particulière du téléphone"
-
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
-msgstr "Type de téléphone"
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-msgid "Choose a phone type"
-msgstr "Sélectionnez un type de téléphone"
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr "Rafraichir"
-
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr "Mode DTMF"
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr "Adresse ip par défaut"
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr "Dépassement du temps de réponse"
-
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr "Moins"
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr "Type d'authentification"
-
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
-msgstr "Secret"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr "mot de passe utilisé pour l'authentification rsa"
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr "mot de passe utilisé pour l'authentification rsa"
-
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
-msgstr "Code du compte téléphonique"
-
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr "Regrouper des lignes"
-
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr "Machines qui peuvent se connecter"
-
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr "Machines qui peuvent pas se connecter"
-
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr "MSN"
+msgstr "Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
 
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
@@ -5516,28 +5387,18 @@ msgstr "S
 msgid "Show network devices"
 msgstr "Montrer les périphériques réseau"
 
-#: plugins/admin/systems/headpage.tpl:54
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr "Expression régulière pour sélectionner les noms de systèmes"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
-msgstr "Affichage des terminaux de l'utilisateur"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Afficher les systèmes de l'utilisateur"
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr "Le nom de l'utilisateur duquel les terminaux sont affichés"
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-msgid "The required field 'MAC-address' is not set."
-msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-msgid "The required field 'IP-address' is not set."
-msgstr "Le champ obligatoire 'IP-address' n'est pas rempli."
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr "Clavier"
@@ -5720,6 +5581,16 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Changer le mot de passe influe seulement sur l'identification."
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+msgid "The required field 'MAC-address' is not set."
+msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'IP-address' is not set."
+msgstr "Le champ obligatoire 'IP-address' n'est pas rempli."
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr "Nom du périphérique"
@@ -5841,8 +5712,7 @@ msgstr "Ajouter des modules 
 
 #: plugins/admin/systems/startup.tpl:67
 msgid "Automount devices (format: complete autofs entry)"
-msgstr ""
-"Montage automatique des périphériques (format: entrée complète de autofs)"
+msgstr "Montage automatique des périphériques (format: entrée complète de autofs)"
 
 #: plugins/admin/systems/startup.tpl:69
 msgid "Add additional automount entries"
@@ -5883,7 +5753,7 @@ msgstr "Configuration r
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
-msgstr ""
+msgstr "Impossible d'effacer ce téléphone parce que certains utilisateurs l'utilisent. Un de ces utilisateur est '%s'."
 
 #: plugins/admin/systems/class_phoneGeneric.inc:270
 msgid "The required field 'Phone name' is not set."
@@ -5901,48 +5771,116 @@ msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminaux"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr "Configuration particulière du téléphone"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-#, fuzzy
-msgid "Phone queue"
-msgstr "Numéros de téléphone"
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
+msgstr "Type de téléphone"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "Liste de dsitribution"
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+msgid "Choose a phone type"
+msgstr "Sélectionnez un type de téléphone"
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr "Adresse de messagerie principale pour cette liste de distribution"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
+msgstr "Rafraichir"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Sélectionnez les objets à ajouter"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr "Mode DTMF"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Sélectionner pour voir les départements"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr "Adresse ip par défaut"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Montrer les départements"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr "Dépassement du temps de réponse"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr "Sélectionnez pour voir les comptes GOsa"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr "Moins"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
-msgstr "Afficher les utilisateurs"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr "Type d'authentification"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
-msgstr "Sélectionnez pour afficher les groupes GOsa"
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr "Secret"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr "mot de passe utilisé pour l'authentification rsa"
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr "mot de passe utilisé pour l'authentification rsa"
+
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr "Code du compte téléphonique"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr "Regrouper des lignes"
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr "Machines qui peuvent se connecter"
+
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr "Machines qui peuvent pas se connecter"
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr "MSN"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminaux"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
+msgstr "Queue téléphonique"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Sélectionnez les objets à ajouter"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr "Sélectionner pour voir les départements"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr "Montrer les départements"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
+msgstr "Sélectionnez pour voir les comptes GOsa"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Show people"
+msgstr "Afficher les utilisateurs"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see GOsa groups"
+msgstr "Sélectionnez pour afficher les groupes GOsa"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Show groups"
 msgstr "Afficher les groupes"
 
@@ -6000,55 +5938,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Sélectionnez l'opération à exécuter pour ce groupe de terminaux"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Groupes d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "Comptes UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr "Serveurs"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr "Clients légers"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr "Stations de travail"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Vous êtes sur le point de supprimer le groupe objet '%s'."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "Create new object group"
-msgstr "Créer un nouveau groupe d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Name of object groups"
-msgstr "Nom du groupe d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Groupes d'objets"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Groupes"
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr "Ce 'dn' n'est pas un groupe objet."
@@ -6109,6 +5998,55 @@ msgstr "Les groupes objets doivent avoir au minimum un membre!"
 msgid "You can combine two different object types at maximum only!"
 msgstr "Vous pouvez combiner au maximum deux objets différents !"
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Groupes d'objets"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr "Comptes UNIX"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr "Serveurs"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr "Clients légers"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr "Stations de travail"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Vous êtes sur le point de supprimer le groupe objet '%s'."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
+msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "Create new object group"
+msgstr "Créer un nouveau groupe d'objets"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Name of object groups"
+msgstr "Nom du groupe d'objets"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Groupes d'objets"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Groupes"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nom du groupe"
@@ -6117,20 +6055,6 @@ msgstr "Nom du groupe"
 msgid "Member objects"
 msgstr "Objets membres"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-"L'extension messagerie est activée pour ce groupe, vous pouvez la désactiver "
-"en cliquant sur le bouton ci-dessous."
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"L'extension de messagerie est désactivée pour ce groupe, vous pouvez "
-"l'activer en cliquant sur le bouton ci-dessous."
-
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -6182,294 +6106,449 @@ msgstr "Afficher les groupes contenant des terminaux"
 msgid "Show groups containing printers"
 msgstr "Afficher les groupes contenant des imprimantes"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 msgid "Display object groups matching"
 msgstr "Afficher les groupes d'objets correspondants"
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-#, fuzzy
-msgid "Queue Settings"
-msgstr "Préférences des quotas"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "Liste de dsitribution"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr "Adresse de messagerie principale pour cette liste de distribution"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid "This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
+"L'extension messagerie est activée pour ce groupe, vous pouvez la désactiver "
+"en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
-#, fuzzy
-msgid "Generic queue Settings"
-msgstr "Information générales sur l'utilisateur"
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"L'extension de messagerie est désactivée pour ce groupe, vous pouvez "
+"l'activer en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-#, fuzzy
-msgid "Phone Number"
-msgstr "Numéros de téléphone"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+msgid "Remove the phone queue from this Account"
+msgstr "Supprimer la queue téléphonique de ce compte"
 
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid "Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr "Une queue téléphonique existe pour ce groupe. Vous pouvez la désactiver en cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+msgid "Create phone queue"
+msgstr "Créer une queue téléphonique"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
+msgstr "Les queues téléphoniques sont désactivées pour ce groupe. Vous pouvez les activer en cliquant sur le bouton ci-dessous."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
+msgstr "Uruguay"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
+msgstr "Non"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "Yes"
+msgstr "Oui"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:136
 #, fuzzy
-msgid "Down"
-msgstr "Domaine"
+msgid "ring all available channels until one answers"
+msgstr "faire sonner tout les canaux disponibles jusqu'à ce que l'un deux réponde"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/class_phonequeue.inc:137
 #, fuzzy
-msgid "Timeout"
-msgstr "Temps d'attente(s)"
+msgid "take turns ringing each available interface"
+msgstr "faire sonner les interfaces disponibles tour à tour"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Réessayer"
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+#, fuzzy
+msgid "ring interface which was least recently called by this queue"
+msgstr "faire sonner la dernière interface qui à été appelée par cette queue"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/class_phonequeue.inc:139
 #, fuzzy
-msgid "Strategy"
-msgstr "Département"
+msgid "ring the one with fewest completed calls from this queue"
+msgstr "faire sonner celle qui à eu le moins d'appel de cette queue"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
-msgid "Max queue length"
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr "Faire sonner un interface de manière aléatoire"
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
-msgid "(in seconds)"
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+msgid "Timeout must be numeric"
+msgstr "Le délai d'attente doit être un chiffre"
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
-msgid "Announce holdtime"
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:181
+msgid "Retry must be numeric"
+msgstr "Le délai de rappel automatique doit être un chiffre"
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
-msgid "Allow the called user to transfer his call"
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:184
+msgid "Max queue length must be numeric"
+msgstr "La taille maximale de la queue doit être numérique"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:187
+#, fuzzy
+msgid "Announce frequency must be numeric"
+msgstr "La fréquence du message d'annonce doit être numérique"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:190
+msgid "There must be least one queue number defined."
+msgstr "Il doit y avoir au moins un numéro de queue définie."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+"Le serveur MySQL '%s' n'est pas joignable avec l'utilisateur '%s', veuillez "
+"vérifier les logs GOsa pour les erreurs mysql."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, php-format
+msgid "Can't select database %s on %s."
+msgstr "Impossible de sélectionner la base de données %s située sur %s."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
+#, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr "Impossible d'éffacer dans la base de données %s située sur le serveur %s."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#, 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'."
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
+msgstr "Préférences des queues"
+
+#: plugins/admin/ogroups/phonequeue.tpl:6
+msgid "Generic queue setup"
+msgstr "Paramètres de base des queues"
+
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "Generic queue Settings"
+msgstr "Paramètres par défaut des queues"
+
+#: plugins/admin/ogroups/phonequeue.tpl:11
+msgid "Phone Number"
+msgstr "Numéro de téléphone"
+
+#: plugins/admin/ogroups/phonequeue.tpl:23
+msgid "Down"
+msgstr "En bas"
+
+#: plugins/admin/ogroups/phonequeue.tpl:39
+msgid "Timeout"
+msgstr "Temps d'attente"
+
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Réessayer"
+
+#: plugins/admin/ogroups/phonequeue.tpl:55
+msgid "Strategy"
+msgstr "Stratégie"
+
+#: plugins/admin/ogroups/phonequeue.tpl:67
+msgid "Max queue length"
+msgstr "Taille maximale de la queue"
+
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Announce frequency"
+msgstr "Fréquence du message d'annonce"
+
+#: plugins/admin/ogroups/phonequeue.tpl:79
+msgid "(in seconds)"
+msgstr "(en secondes)"
+
+#: plugins/admin/ogroups/phonequeue.tpl:84
+msgid "Announce holdtime"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:98
+msgid "Allow the called user to transfer his call"
+msgstr "Permettre à l'utilisateur appelé de transférer son appel"
 
 #: plugins/admin/ogroups/phonequeue.tpl:106
 msgid "Allows calling user to transfer call"
-msgstr ""
+msgstr "Permettre à l'utilisateur qui appelle de transférer son appel"
 
 #: plugins/admin/ogroups/phonequeue.tpl:114
 msgid "Allow the called to hangup by pressing *"
-msgstr ""
+msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 
 #: plugins/admin/ogroups/phonequeue.tpl:122
 msgid "Allows calling to hangup by pressing *"
-msgstr ""
+msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 
 #: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
+msgstr "Sonner au lieu de mettre un musique d'ambiance"
+
+#: plugins/admin/ogroups/phonequeue.tpl:138
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:135
+#: plugins/admin/ogroups/phonequeue.tpl:143
 msgid "Use music on hold instead of ringing"
-msgstr ""
+msgstr "Mettre de la musique lorsqu'on est en attente plutôt que la sonnerie"
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
+#: plugins/admin/ogroups/phonequeue.tpl:152
 msgid "Music on hold"
-msgstr ""
+msgstr "Musique d'attente"
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
-#, fuzzy
+#: plugins/admin/ogroups/phonequeue.tpl:160
 msgid "Welcome sound file"
-msgstr "Bienvenue %s!"
+msgstr "Fichier son de bienvenue"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
-#, fuzzy
+#: plugins/admin/ogroups/phonequeue.tpl:168
 msgid "Announce message"
-msgstr "Message d'absence"
+msgstr "Message de présentation"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:176
 msgid "Sound file for 'You are next ...'"
-msgstr ""
+msgstr "Fichier son pour 'Vous êtes le suivant ...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:184
 msgid "'There are ...'"
-msgstr ""
+msgstr "'Il y a ...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:192
 msgid "'... calls waiting'"
-msgstr ""
+msgstr "'... appels en attente'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
-#, fuzzy
+#: plugins/admin/ogroups/phonequeue.tpl:200
 msgid "'Thank you' message"
-msgstr "Statut"
+msgstr "Message 'Merci'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:208
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:216
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:224
 msgid "Hold sound file"
+msgstr "Fichier son du message d'attente"
+
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Configuration du téléphone"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+msgid "no macro"
+msgstr "pas de macros"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+msgid "undefined"
+msgstr "non défini"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
+msgid "Error while performing query "
+msgstr "Une erreur s'est produite lors de la requête "
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
 msgstr ""
+"La macro que vous aviez choisi dans le passé n'est plus disponible, veuillez "
+"en choisir une autre."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-#, fuzzy
-msgid "Remove the phone queue from this Account"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
+msgstr "Ce compte n'est pas d'extension téléphoniques."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
 msgstr "Supprimer l'extension téléphonique"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-#, fuzzy
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
 msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 "Une extension téléphone existe pour cet utilisateur. Vous pouvez la "
 "supprimer en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid "Create phone queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
 msgstr "Créer un compte téléphone"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
 msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
+msgstr "Aucun extension téléphone n'existe pour cet utilisateur. Vous ne pouvez pas l'activer lorsque aucun uid n'est indiqué."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 "Aucun extension téléphone n'existe pour cet utilisateur. Vous pouvez en "
 "créer une en cliquant sur le bouton ci-dessous."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:131
-msgid "Uruguai"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr "Veuillez entrer un numéro de téléphone valide!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "No"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Choisissez votre téléphone privé"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-#, fuzzy
-msgid "Yes"
-msgstr "oui"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#, php-format
+msgid "You need to specify at least one phone number!"
+msgstr "Vous devez au moins indiquer un numéro de téléphone!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:133
-msgid "ring all available channels until one answers"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, php-format
+msgid "You need to specify a Phone PIN."
+msgstr "Vous devez spécifier un PIN code pour le téléphone."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
+msgstr "Le PIN code est invalide, seul les nombres sont permis."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "ring interface which was least recently called by this queue"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#, php-format
+msgid "The given PIN is too short"
+msgstr "Le code PIN est trop petit"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring the one with fewest completed calls from this queue"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
+#, php-format
+msgid "The number '%s' is no valid phone number!"
+msgstr "Le numéro '%s' n'est pas un numéro de téléphone valide!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "ring random interface"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "La valeur d'attente'%s' contient des caractères invalides!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "round robin with memory, remember where we left off last ring pass"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, 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"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
-#, fuzzy
-msgid "Timeout must be numeric"
-msgstr "Le port sieve doit être numérique."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
+msgstr "Arrêter"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
+msgstr "L'utilisateur '%s' à été enlevé de la queue '%s'."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
-msgid "Max queue length must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Numéros de téléphones"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Transférer les appels vers"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
-msgid "There must be least one queue number defined."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Numéros de téléphone"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-#: plugins/admin/ogroups/class_phonequeue.inc:511
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:922
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
-"Le serveur MySQL '%s' n'est pas joignable avec l'utilisateur '%s', veuillez "
-"vérifier les logs GOsa pour les erreurs mysql."
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Temps d'attente(s)"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:221
-#: plugins/admin/ogroups/class_phonequeue.inc:521
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
-#, php-format
-msgid "Can't select database %s on %s."
-msgstr "Impossible de sélectionner la base de données %s située sur %s."
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
+msgstr "Macro téléphoniques"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:255
-#: plugins/admin/ogroups/class_phonequeue.inc:410
-#: plugins/admin/ogroups/class_phonequeue.inc:561
-#, fuzzy, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr "Impossible de sélectionner la base de données %s située sur %s."
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "fill out"
+msgstr "remplir"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:439
-#: plugins/admin/ogroups/class_phonequeue.inc:441
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
+msgstr "Code PIN du téléphone"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
-msgstr "Macros téléphoniques"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Rapports téléphoniques"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Vous êtes sur le point de supprimer la macro '%s'."
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"Impossible de se connecter à la base de données des téléphones, aucun "
+"rapport ne peut être affiché!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
-msgstr "Vous n'êtes pas autorisé à supprimer cette macro!"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr ""
+"Impossible de sélectionner la base de données des téléphones pour la "
+"création de rapports!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
-msgstr "Créer une nouvelle macro téléphonique"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "La requête sur la base de données des téléphones a échoué!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
-msgstr "Visible"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Emetteur"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
-"Ce tableau montre toutes les macros téléphoniques, dans l'arbre sélectionné."
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Destinataire"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-msgid "Macro"
-msgstr "macro"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "visible"
-msgstr "visible"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Durée"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "invisible"
-msgstr "invisible"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Rapports téléphoniques"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6548,255 +6627,123 @@ msgid "Choose subtree to place macro in"
 msgstr "Sélectionnez la branche où sera placée la macro"
 
 #: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Visible pour l'utilisateur"
-
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Texte de la macro"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
-msgstr "Chaîne de caractère"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
-msgstr "Boite à choix multiple"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
-msgstr "Booléen"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
-msgstr "Supprimer les paramètres inutilisés"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-"Permissions insuffisantes, impossible de changer l'attribut '%s' dans la "
-"macro téléphonique."
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
-#, 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"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr "Le paramètre %s à des valeurs incorrectes par rapport au type booléen."
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Liste des macros"
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Ce menu permet d'ajouter, de modifier ou de supprimer les macros "
-"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
-"travaillez avec un nombre élevé de macros."
-
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
-msgid "Display macros  matching"
-msgstr "Afficher les macros correspondantes"
-
-#: plugins/gofon/macro/headpage.tpl:44
-msgid "Regular expression for matching macro names"
-msgstr "Expression régulière correspondant à des noms de macro"
-
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
-msgstr "Administration des macros téléphoniques"
-
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "type"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
-msgid "no macro"
-msgstr "pas de macros"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
-msgid "undefined"
-msgstr "non défini"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
-msgid "Error while performing query "
-msgstr "Une erreur s'est produite lors de la requête "
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:492
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
-msgstr ""
-"La macro que vous aviez choisi dans le passé n'est plus disponible, veuillez "
-"en choisir une autre."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
-msgid "This account has no phone extensions."
-msgstr "Ce compte n'est pas d'extension téléphoniques."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
-msgid "Remove phone account"
-msgstr "Supprimer l'extension téléphonique"
+msgid "Visible for user"
+msgstr "Visible pour l'utilisateur"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:576
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Une extension téléphone existe pour cet utilisateur. Vous pouvez la "
-"supprimer en cliquant sur le bouton ci-dessous."
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Texte de la macro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:578
-msgid "Create phone account"
-msgstr "Créer un compte téléphone"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Liste des macros"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
+#: plugins/gofon/macro/headpage.tpl:24
 msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
-"Aucun extension téléphone n'existe pour cet utilisateur. Vous pouvez en "
-"créer une en cliquant sur le bouton ci-dessous."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
-msgid "Please enter a valid phone number!"
-msgstr "Veuillez entrer un numéro de téléphone valide!"
+"Ce menu permet d'ajouter, de modifier ou de supprimer les macros "
+"sélectionnés. Vous pouvez utiliser les différents filtres lorsque vous "
+"travaillez avec un nombre élevé de macros."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-msgid "Choose your private phone"
-msgstr "Choisissez votre téléphone privé"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Afficher les macros correspondant à"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
-#, php-format
-msgid "You need to specify at least one phone number!"
-msgstr "Vous devez au moins indiquer un numéro de téléphone!"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Afficher les macros correspondantes"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
-#, fuzzy, php-format
-msgid "You need to specify a Phone PIN."
-msgstr "Vous devez au moins indiquer un numéro de téléphone!"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Expression régulière correspondant à des noms de macro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:777
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
-msgstr "Le PIN code est invalide, seul les nombres sont permis."
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+msgstr "Administration des macros téléphoniques"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
-#, php-format
-msgid "The given PIN is too short"
-msgstr "Le code PIN est trop petit"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
+msgstr "Chaîne de caractère"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:794
-#, php-format
-msgid "The number '%s' is no valid phone number!"
-msgstr "Le numéro '%s' n'est pas un numéro de téléphone valide!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
+msgstr "Boite à choix multiple"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
-#, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "La valeur d'attente'%s' contient des caractères invalides!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr "Booléen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
-msgid "Stop"
-msgstr "Arrêter"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
+msgstr "Supprimer les paramètres inutilisés"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
+"Permissions insuffisantes, impossible de changer l'attribut '%s' dans la "
+"macro téléphonique."
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Numéros de téléphones"
-
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Transférer les appels vers"
-
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Numéros de téléphone"
-
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Temps d'attente(s)"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr "Le paramètre %s à des valeurs incorrectes par rapport au type booléen."
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
-msgid "Phone macro"
-msgstr "Macro téléphoniques"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
+msgstr "Le nombre de paramètres de la macro à change, vous devez mettre à jour chaque utilisateur qui utilise la macro '%s'."
 
-#: plugins/gofon/phoneaccount/generic.tpl:77
-msgid "Phone PIN"
-msgstr "Code PIN du téléphone"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr "Macros téléphoniques"
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Configuration du téléphone"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "Vous êtes sur le point de supprimer la macro '%s'."
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Rapports téléphoniques"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
+msgstr "Vous n'êtes pas autorisé à supprimer cette macro!"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"Impossible de se connecter à la base de données des téléphones, aucun "
-"rapport ne peut être affiché!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
+msgstr "Créer une nouvelle macro téléphonique"
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"Impossible de sélectionner la base de données des téléphones pour la "
-"création de rapports!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
+msgstr "Visible"
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr "La requête sur la base de données des téléphones a échoué!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr "Ce tableau montre toutes les macros téléphoniques, dans l'arbre sélectionné."
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Emetteur"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
+msgstr "macro"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Destinataire"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
+msgstr "visible"
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
+msgstr "invisible"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Durée"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Rapports téléphoniques"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "type"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6842,34 +6789,6 @@ msgstr "L'
 msgid "Welcome %s!"
 msgstr "Bienvenue %s!"
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-"Impossible d'ouvrir le fichier spécifié, vérifiez que celui ci est existant "
-"et accessible"
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr "Impossible de lire le certificat spécifié / ou chaîne vide spécifiée"
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-"Impossible de charger le certificat, probablement un format non supporté "
-"(utilisez un format PEM/DER) "
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr "Le format doit être PEM, afin de pouvoir afficher les informations"
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr "Impossible de créer/ouvrir le fichier"
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr "Pas de certificat valide chargé"
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -6958,8 +6877,7 @@ msgstr "Echec lors de l'ajout d'un verrou. Le serveur LDAP indique '%s'."
 #: include/functions.inc:411
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
-msgstr ""
-"Echec lors de la suppression d'un verrou. Le serveur LDAP indique '%s'."
+msgstr "Echec lors de la suppression d'un verrou. Le serveur LDAP indique '%s'."
 
 #: include/functions.inc:441
 msgid ""
@@ -7050,8 +6968,7 @@ msgstr ""
 #: include/class_mail-methods-cyrus.inc:115
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr ""
-"Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
+msgstr "Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
 
 #: include/class_mail-methods-cyrus.inc:131
 #, php-format
@@ -7064,39 +6981,100 @@ msgstr ""
 "Erreur: imap_getacl n'est pas implémenté, il est impossible de supprimer les "
 "informations à propos des acls."
 
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-"Erreur: imap_getacl n'est pas disponible, impossible d'obtenir les "
-"permissions imap!"
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Erreur: imap_getacl n'est pas disponible, impossible d'obtenir les "
+"permissions imap!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+"Impossible de supprimer les boites de messagerie IMAP. Le serveur indique '%"
+"s'."
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "Impossible de se connecter au serveur SIEVE. Le serveur indique '%s'."
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "Impossible de récupérer le script sieve. Le serveur indique '%s'."
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Impossible d'envoyer un script à sieve. Le serveur indique '%s'."
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr "Impossible d'activer les scripts sieve de GOsa. Le serveur indique '%s'."
+
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+"Votre fichier de configuration gosa.conf à changé partiellement . Veuillez "
+"le convertir en utilisant le script fix_config.sh!"
+
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"Vous êtes actuellement en train d'éditer une entrée de la base de données. "
+"Voulez vous annuler les modifications?"
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Ce 'dn' n'a pas d'extension pour le compte."
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Cette extension est vide."
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_plugin.inc:398
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgid "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Impossible de supprimer les boites de messagerie IMAP. Le serveur indique '%"
-"s'."
+"La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
+"pas."
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "Impossible de se connecter au serveur SIEVE. Le serveur indique '%s'."
+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/class_mail-methods-cyrus.inc:236
+#: include/class_plugin.inc:454
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "Impossible de récupérer le script sieve. Le serveur indique '%s'."
+msgid "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
+"pas."
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_config.inc:69
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Impossible d'envoyer un script à sieve. Le serveur indique '%s'."
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
 
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
-"Impossible d'activer les scripts sieve de GOsa. Le serveur indique '%s'."
+"Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
+"l'administrateur du système."
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "SID et/ou RIDBASE absents du fichier de configuration!"
 
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
@@ -7111,38 +7089,101 @@ msgstr ""
 "La modification a échoué du mot de passe à échoué. Le serveur LDAP indique '%"
 "s'."
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:426
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
-"pas."
-
 #: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgid "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 "La configuration de SMBHASH dans gosa.conf est incorrecte ! Impossible de "
 "changer le mot de passe Samba."
 
-#: include/class_pluglist.inc:98
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
-"Votre fichier de configuration gosa.conf à changé partiellement . Veuillez "
-"le convertir en utilisant le script fix_config.sh!"
+"Attention : Impossible de modifier les mots de passe kerberos. Votre version "
+"de PHP n'a pas le support de kerberos. Votre mot de passe reste inchangé."
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "La connexion avec Kerberos a échoué!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "La modification du mot de passe dans la base Kerberos a échoué!"
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+"Impossible d'utiliser ssha pour l'encryption (Fonction sha1 / mhash / crypt "
+"manquante)"
+
+#: include/class_ldap.inc:438
+#, php-format
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
-"Vous êtes actuellement en train d'éditer une entrée de la base de données. "
-"Voulez vous annuler les modifications?"
+"La création automatique de type '%s' n'est pas supportée. Veuillez faire un "
+"rapport à l'équipe de GOsa."
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
+"avec 'dn: ...' à la ligne %s"
+
+#: include/class_ldap.inc:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
+"votre fichier LDIF à partir de la ligne %s!"
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+"Impossible d'ouvrir le fichier spécifié, vérifiez que celui ci est existant "
+"et accessible"
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr "Impossible de lire le certificat spécifié / ou chaîne vide spécifiée"
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+"Impossible de charger le certificat, probablement un format non supporté "
+"(utilisez un format PEM/DER) "
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr "Le format doit être PEM, afin de pouvoir afficher les informations"
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr "Impossible de créer/ouvrir le fichier"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr "Pas de certificat valide chargé"
+
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr "%s résultats de votre recherche avec le mot %s interprété comme %s"
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr "%s%% trouvés dans le fichier %s"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7167,8 +7208,7 @@ msgstr ""
 
 #: include/functions_setup.inc:140
 #, php-format
-msgid ""
-"Optional objectclass '%s' required by plugin '%s' does not have version %s"
+msgid "Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 "l'objectCLass optionnel '%s' requis par l'extension '%s' nécessite la "
 "version %s"
@@ -7222,8 +7262,7 @@ msgstr "Le support de WEBDAV est activ
 
 #: include/functions_setup.inc:211
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
-msgstr ""
-"Le support de phpgroupware est désactivé, aucun schéma ne semble installé"
+msgstr "Le support de phpgroupware est désactivé, aucun schéma ne semble installé"
 
 #: include/functions_setup.inc:216
 msgid "Support for phpgroupware enabled"
@@ -7298,8 +7337,7 @@ msgstr "V
 
 #: include/functions_setup.inc:293
 msgid "This is the main module used by GOsa and therefore really required."
-msgstr ""
-"Ce module est le module de base utilisé par GOsa et est donc indispensable."
+msgstr "Ce module est le module de base utilisé par GOsa et est donc indispensable."
 
 #: include/functions_setup.inc:296
 msgid "Checking for XML functions"
@@ -7412,8 +7450,7 @@ msgid "Checking for snmp Module"
 msgstr "Vérification du module snmp"
 
 #: include/functions_setup.inc:332
-msgid ""
-"Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgid "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr "Le protocole SNMP est nécessaire pour pouvoir surveiller les clients."
 
 #: include/functions_setup.inc:342
@@ -7458,8 +7495,7 @@ msgstr ""
 
 #: include/functions_setup.inc:379
 msgid "Checking for a way to generate LM/NT password hashes"
-msgstr ""
-"Vérification de la possibilité de générer des mots de passe au format LM/NT"
+msgstr "Vérification de la possibilité de générer des mots de passe au format LM/NT"
 
 #: include/functions_setup.inc:380
 msgid ""
@@ -7566,145 +7602,44 @@ msgstr ""
 #: include/functions_setup.inc:778
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
-msgstr ""
-"Connection au serveur réussie, mais le serveur semble complètement vide, "
-"veuillez vérifier toutes informations un seconde fois"
-
-#: include/functions_setup.inc:834
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"L'attribut obligatoire '%s' n'existe pas pour ce formulaire. Veuillez le "
-"compléter!"
-
-#: include/functions_setup.inc:865
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
-msgstr ""
-"Impossible de les les informations de schéma, GOsa à besoin de connaître la "
-"configuration des vos schémas. Veuillez vérifier qu'elles sont lisibles par "
-"GOsa"
-
-#: include/functions_setup.inc:874
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "Impossible de se connecter au serveur LDAP. Le serveur indique '%s'."
-
-#: include/functions_setup.inc:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"Le compte administrateur de GOsa n'existe pas, vous ne pourrez rien "
-"administrer!"
-
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
-"l'administrateur du système."
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "SID et/ou RIDBASE absents du fichier de configuration!"
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-"Impossible d'utiliser ssha pour l'encryption (Fonction sha1 / mhash / crypt "
-"manquante)"
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Attention : Impossible de modifier les mots de passe kerberos. Votre version "
-"de PHP n'a pas le support de kerberos. Votre mot de passe reste inchangé."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "La connexion avec Kerberos a échoué!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "La modification du mot de passe dans la base Kerberos a échoué!"
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr "%s résultats de votre recherche avec le mot %s interprété comme %s"
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr "%s%% trouvés dans le fichier %s"
-
-#: include/class_ldap.inc:438
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"La création automatique de type '%s' n'est pas supportée. Veuillez faire un "
-"rapport à l'équipe de GOsa."
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"please check all informations twice"
 msgstr ""
-"Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
-"avec 'dn: ...' à la ligne %s"
-
-#: include/class_ldap.inc:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "Le dn : '%s' (de la ligne %s) existe déjà dans l'arbre LDAP."
+"Connection au serveur réussie, mais le serveur semble complètement vide, "
+"veuillez vérifier toutes informations un seconde fois"
 
-#: include/class_ldap.inc:700
+#: include/functions_setup.inc:834
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
 msgstr ""
-"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
-"votre fichier LDIF à partir de la ligne %s!"
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Ce 'dn' n'a pas d'extension pour le compte."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Cette extension est vide."
+"L'attribut obligatoire '%s' n'existe pas pour ce formulaire. Veuillez le "
+"compléter!"
 
-#: include/class_plugin.inc:398
-#, php-format
+#: include/functions_setup.inc:865
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
 msgstr ""
-"La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
-"pas."
+"Impossible de les les informations de schéma, GOsa à besoin de connaître la "
+"configuration des vos schémas. Veuillez vérifier qu'elles sont lisibles par "
+"GOsa"
 
-#: include/class_plugin.inc:454
+#: include/functions_setup.inc:874
 #, php-format
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr "Impossible de se connecter au serveur LDAP. Le serveur indique '%s'."
+
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
+#: ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
-"La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
-"pas."
+"Le compte administrateur de GOsa n'existe pas, vous ne pourrez rien "
+"administrer!"
 
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
@@ -7720,8 +7655,7 @@ msgstr "suivant"
 
 #: html/helpviewer.php:141
 #, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgid "Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 "Impossible de lire les fichiers d'aides depuis '%s', probablement qu'il n'y "
 "a pas d'aide disponible."
@@ -7740,8 +7674,7 @@ msgstr "Echec des requ
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-"Erreur: getvcard.php nécessite un paramètre pour exporter au format vcard!"
+msgstr "Erreur: getvcard.php nécessite un paramètre pour exporter au format vcard!"
 
 #: html/setup.php:86
 #, php-format
@@ -7752,6 +7685,31 @@ msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation smarty n'est pas "
 "accessible, vérifiez son existence et les droits de ce répertoire!"
 
+#: html/main.php:96
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+"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:139
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+"Attention: la mémoire disponible est insuffisante - Veuillez augmenter le "
+"paramètre memory_limit!"
+
+#: html/main.php:263
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr "Impossible de trouver une définition pour l'extension '%s'!"
+
+#: html/main.php:292
+msgid "Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+"La création de cette page à occasionné des erreurs d'après le vérificateur "
+"du W3C!"
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7773,8 +7731,7 @@ msgstr ""
 "vous assurez que c'est possible."
 
 #: html/index.php:156
-msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgid "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 "Votre installation LDAP contient de vieux schémas. Veuillez réexecuter "
 "l'installation."
@@ -7799,31 +7756,38 @@ msgstr "La session ne sera pas crypt
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
-#: html/main.php:96
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
-"Register globals est activé. GOsa ne permettra pas aux utilisateurs de se "
-"connecter tant que ceci n'est pas corrigé par un administrateur."
+"L'option size limit rend les opérations LDAP plus rapides et permet au "
+"serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile "
+"de gérer des grandes bases de données sans de longs temps d'attentes, serait "
+"de limiter la recherche à des valeurs plus petites et d'utiliser les filtres "
+"pour obtenir les valeurs que vous recherchez."
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-"Attention: la mémoire disponible est insuffisante - Veuillez augmenter le "
-"paramètre memory_limit!"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Veuillez choisir la façon de réagir pour cette session"
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr "Impossible de trouver une définition pour l'extension '%s'!"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignorer cette erreur et montrer toutes les entrées retournées par le serveur "
+"LDAP"
 
-#: html/main.php:292
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
-"La création de cette page à occasionné des erreurs d'après le vérificateur "
-"du W3C!"
+"ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce "
+"au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
+"restreindre les données a visualiser"
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -7854,46 +7818,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr "Bienvenue dans le menu de configuration de GOsa!"
-
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
-msgstr ""
-"Vous lancez GOsa pour la première fois - aucune configuration n'a été "
-"trouvée. L'utilitaire de configuration va essayer de vous aider à obtenir "
-"une configuration utilisable en trois étapes : vérification de la présence "
-"des modules PHP requis, ensuite des programmes requis et optionnels et "
-"finalement des informations permettant à GOsa de se connecter à l'annuaire "
-"LDAP."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "Vous avez déjà un compte Administrateur et un groupe."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-"Pour fournir un accès administratif complet a GOsa, vous avez besoin d'un "
-"groupe spécial qui contient l'utilisateur administrateur. Le programme "
-"d'installation peut vous aider à réaliser cela. Entrer le nom désirer et le "
-"mot de passe ci dessous pour créer les entrées manquantes."
-
 #: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
@@ -7913,38 +7837,27 @@ msgstr "Connexion"
 msgid "Click here to log in"
 msgstr "Cliquez ici pour vous connecter"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"L'option size limit rend les opérations LDAP plus rapides et permet au "
-"serveur LDAP d'avoir un niveau de charge plus léger. La façon la plus facile "
-"de gérer des grandes bases de données sans de longs temps d'attentes, serait "
-"de limiter la recherche à des valeurs plus petites et d'utiliser les filtres "
-"pour obtenir les valeurs que vous recherchez."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Veuillez choisir la façon de réagir pour cette session"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignorer cette erreur et montrer toutes les entrées retournées par le serveur "
-"LDAP"
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
+msgstr "Bienvenue dans le menu de configuration de GOsa!"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
 msgstr ""
-"ignorer cette erreur et montrer toutes les entrées qui sont récupérées grâce "
-"au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
-"restreindre les données a visualiser"
+"Vous lancez GOsa pour la première fois - aucune configuration n'a été "
+"trouvée. L'utilitaire de configuration va essayer de vous aider à obtenir "
+"une configuration utilisable en trois étapes : vérification de la présence "
+"des modules PHP requis, ensuite des programmes requis et optionnels et "
+"finalement des informations permettant à GOsa de se connecter à l'annuaire "
+"LDAP."
 
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
@@ -7966,6 +7879,24 @@ msgstr "D
 msgid "Signed in:"
 msgstr "Connexion:"
 
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
+msgstr "Configuration en cours..."
+
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
+msgid ""
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
+msgstr ""
+"La seconde étape vérifie la présence de programmes complémentaires ainsi que "
+"leur numéro de version minimale."
+
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Conflit de verrou détecté"
@@ -7981,23 +7912,23 @@ msgstr ""
 "d'une entrée. Dans ce cas, vous pouvez supprimez le verrou en cliquant sur "
 "le bouton <i>Remove</i>."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
-msgstr "Configuration en cours..."
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr "Vous avez déjà un compte Administrateur et un groupe."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
 msgstr ""
-"La seconde étape vérifie la présence de programmes complémentaires ainsi que "
-"leur numéro de version minimale."
+"Pour fournir un accès administratif complet a GOsa, vous avez besoin d'un "
+"groupe spécial qui contient l'utilisateur administrateur. Le programme "
+"d'installation peut vous aider à réaliser cela. Entrer le nom désirer et le "
+"mot de passe ci dessous pour créer les entrées manquantes."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
@@ -8234,6 +8165,3 @@ msgstr ""
 "versions. Dans certains cas il peut être intéressant d'activer l'affichage "
 "des erreurs. (Cela peut représenter un risque de sécurité)  "
 
-#, fuzzy
-#~ msgid "Germany"
-#~ msgstr "Allemand"

diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index c90ee9f79552b69e10247544279fec805fe302e2..6d518e97b8a86551da9da18645920336a4fe7390 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -48,7 +48,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -57,7 +57,7 @@ msgstr "Posta"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:713
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -72,22 +72,22 @@ msgstr "Connettività"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:711
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:709
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -118,7 +118,7 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Opzioni"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:507
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
 #, fuzzy
 msgid "Parameter"
 msgstr "Modifica parametri"
@@ -164,7 +164,7 @@ msgstr "Importa da CSV"
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:131
+#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "German"
 msgstr "Tedesco"
 
@@ -192,13 +192,157 @@ msgstr "Inglese"
 msgid "Italian"
 msgstr "Italiano"
 
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Questo fa qualcosa"
+
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "Il metodo di posta '%s' non è definito in gosa.conf"
+
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
+
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Questa identità non ha le estensioni per la posta"
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "Rimuovi le estensioni di posta"
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr "Questa identià possiede estensioni di posta."
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Crea estensioni di posta"
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Stai tentandi di aggiungere un indirizzo di posta non valido alla lista "
+"degli inoltri"
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr "Aggiungere il tuo indirizzo alla lista delgi inoltri non ha senso."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Stai cercando di aggungere un indirizzo di posta non valido alla lista degli "
+"indirizzi alternativi."
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+"Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr "L'indirizzo principale inserito è già in uso."
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr "Il valore di 'Dimensione quota' non è valido"
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Specificare una dimenzione valida per le mail da rigettare."
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr "Devi specificare la dimensione massima delle mail da rigettare."
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Indirizzo principale"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:703
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -233,14 +377,14 @@ msgstr "Lista degli indirizzi alternativi"
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -251,14 +395,14 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:660
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "Aggiungi"
@@ -279,13 +423,13 @@ msgstr "Aggiungi"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
 #: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:21 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Rimuovi"
 
@@ -373,209 +517,64 @@ msgstr "Usa uno script di sieve personalizzato"
 msgid "disables all Mail options!"
 msgstr "disabilita tutte le opzioni di posta!"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Questo fa qualcosa"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "Il metodo di posta '%s' non è definito in gosa.conf"
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "Manca il DESC tag nel messaggio di risposta automatica:"
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:610
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
+msgstr "Esegui"
 
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "Questa identità non ha le estensioni per la posta"
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "Rimuovi le estensioni di posta"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr "Questa identià possiede estensioni di posta."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "Crea estensioni di posta"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni di posta."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Stai tentandi di aggiungere un indirizzo di posta non valido alla lista "
-"degli inoltri"
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr "Aggiungere il tuo indirizzo alla lista delgi inoltri non ha senso."
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Stai cercando di aggungere un indirizzo di posta non valido alla lista degli "
-"indirizzi alternativi."
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr "L'indirizzo che stai cercando di aggiungere  gi in uso"
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-"Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr "L'indirizzo principale inserito è già in uso."
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "Il valore di 'Dimensione quota' non è valido"
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Specificare una dimenzione valida per le mail da rigettare."
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr "Devi specificare la dimensione massima delle mail da rigettare."
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:587
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:528
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr "Esegui"
-
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:51
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:530
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr "Annulla"
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:529
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
+msgstr "Annulla"
 
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
@@ -629,8 +628,8 @@ msgid "Display addresses of department"
 msgstr "Mostra l'indirizzo del dipartimento"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
@@ -663,20 +662,20 @@ msgid "User name of which addresses are shown"
 msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Password"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "Change password"
 msgstr "Cambia la password"
 
@@ -738,8 +737,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -762,14 +761,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:256
+#: plugins/admin/users/class_userManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Le password nuova e ripetuta non corrispondono"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:265
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
@@ -790,6 +789,19 @@ msgstr "Non hai il permesso di cambiare la tua password."
 msgid "External password changer reported a problem: "
 msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleziona un sistema da aggiungere"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostra i sistemi del dipartimento"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Mostra i sistemi che corrispondono a:"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleziona un gruppo da aggiungere"
@@ -850,22 +862,22 @@ msgid "Display groups of department"
 msgstr "Mostra gruppi di dipartimenti"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Mosra gruppi corrispondenti a"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr "Mostra gruppi di utenti"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:80
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Nome dell'utente del quale mostrare i gruppi"
 
@@ -878,19 +890,6 @@ msgstr "L'utente deve cambiare la password alla prima connessione"
 msgid "Password expires on"
 msgstr "La password spira il"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleziona un sistema da aggiungere"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostra i sistemi del dipartimento"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Display systems matching"
-msgstr "Mostra i sistemi che corrispondono a:"
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -950,6 +949,10 @@ msgstr "Lingua predefinita"
 msgid "System trust"
 msgstr "Accesso ai sistemi"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Impostazioni Unix"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -966,7 +969,7 @@ msgstr "non configurata"
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:202
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
 msgid "automatic"
 msgstr "automatico"
 
@@ -1246,10 +1249,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Impostazioni Unix"
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Home di Samba"
@@ -1376,6 +1375,10 @@ msgstr "L'account spira dopo"
 msgid "Allow connection from these workstations only"
 msgstr "Permetti la connessione solo da queste workstation"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Impostazioni Samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selezione le workstation da aggiungere"
@@ -1388,10 +1391,6 @@ msgstr "Mostra le workstation del dipartimento"
 msgid "Display workstations matching"
 msgstr "Mostra le worstation che corrispondono"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Impostazioni Samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Questa identità non possiede estensioni Samba."
@@ -1486,42 +1485,172 @@ msgid ""
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "femmina"
+
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "maschio"
+
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Questa identità non possiede estensioni GOsa."
+
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
 msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
-"Hai modificato il metodo con cui la tua password è immagazzinata nel "
-"database LDAP. Per questo motivo devi inserire nuovamnete la tua password."
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Foto personale"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr "valido"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Elimina foto"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr "invalido"
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Salva"
+#: plugins/personal/generic/class_user.inc:408
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Modifica certificati"
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Informazioni personali"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr ""
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
-msgstr "Cambia foto"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr ""
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:528
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1070
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "Impossibile selezionare il database!"
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Hai modificato il metodo con cui la tua password è immagazzinata nel "
+"database LDAP. Per questo motivo devi inserire nuovamnete la tua password."
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Informazioni personali"
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Foto personale"
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr "Cambia foto"
+
+#: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Cognome"
@@ -1630,9 +1759,9 @@ msgstr "Organizzazione"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1658,8 +1787,8 @@ msgid "Room No."
 msgstr "Stanza No."
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Cellulare"
@@ -1736,6 +1865,15 @@ msgstr "Ultimo recapito"
 msgid "Public visible"
 msgstr "Pubblico"
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Elimina foto"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Salva"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificato standard"
@@ -1746,7 +1884,7 @@ msgstr "Certificato standard"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Rimuovi"
@@ -1763,177 +1901,119 @@ msgstr "Certificato PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr "femmina"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr "maschio"
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Informazioni generiche"
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr "Questa identità non possiede estensioni GOsa."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr "valido"
-
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr "invalido"
-
-#: plugins/personal/generic/class_user.inc:408
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Modifica certificati"
-
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Estenzioni Proxy Internet"
 
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr "Filtra il contenuto non desiderato (p.e. pornografico o violento)"
 
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:505
-msgid "The required field 'Name' is not set."
-msgstr ""
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Limita l'accesso a Internet alle ore lavorative"
 
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
-msgstr ""
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Restringi la quota d'uso di Internet"
 
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:508
-msgid "The required field 'Given name' is not set."
-msgstr ""
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "per"
 
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
 msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
+msgstr "L'indirizzo che stai cercando di aggiungere è già in uso"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr ""
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr "Manuale"
 
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr ""
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr "Anonimo"
 
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1070
-#, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "Impossibile selezionare il database!"
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Informazioni generiche"
-
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Estenzioni Proxy Internet"
-
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr "Filtra il contenuto non desiderato (p.e. pornografico o violento)"
-
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Limita l'accesso a Internet alle ore lavorative"
-
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Restringi la quota d'uso di Internet"
-
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "per"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-#, fuzzy
-msgid "Intranet account"
-msgstr "Crea estensioni telefoniche"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -1987,6 +2067,47 @@ msgstr "giorni"
 msgid "Invitation policy"
 msgstr ""
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Estenzioni WebDAV"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Questa identità non possiede estensioni Samba. Per poterle creare occorre "
+"creare prima le estensioni Unix."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Questa identità non possiede estensioni Samba. Per poterle creare occorre "
+"creare prima le estensioni Unix."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr ""
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "Estenzioni FTP"
@@ -2068,6 +2189,15 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "Questa identità non possiede estensioni di connettività"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2110,196 +2240,122 @@ msgstr "Il valore di 'Dimensione quota' non è valido"
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr "L'indirizzo che stai cercando di aggiungere è già in uso"
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
+msgstr "Tipo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
+msgstr "Descrizione"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Manuale"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anonimo"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+msgid "Information"
+msgstr "Informazioni"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
+msgstr "Liste blocco FAX"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
 #, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
+msgid "You're about to delete the blocklist '%s'."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
+msgid "You have no permission to remove this blocklist."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
+msgid "Please specify a valid phone number."
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:348
+#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/applications/class_applicationManagement.inc:323
+#: plugins/admin/departments/class_departmentManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+#, fuzzy
+msgid "Go up one department"
+msgstr "Mostra dipartimenti"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:348
+#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/applications/class_applicationManagement.inc:323
+#: plugins/admin/departments/class_departmentManagement.inc:277
+#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
+msgid "Up"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Estenzioni WebDAV"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-#, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Questa identità non possiede estensioni Samba. Per poterle creare occorre "
-"creare prima le estensioni Unix."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-#, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Questa identità non possiede estensioni Samba. Per poterle creare occorre "
-"creare prima le estensioni Unix."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
-msgstr "Questa identità non possiede estensioni di connettività"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
-msgstr "Liste blocco FAX"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
-msgid "You have no permission to remove this blocklist."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
-msgid "Please specify a valid phone number."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
-#: plugins/admin/applications/class_applicationManagement.inc:323
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#, fuzzy
-msgid "Go up one department"
-msgstr "Mostra dipartimenti"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
-#: plugins/admin/applications/class_applicationManagement.inc:323
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
-#: plugins/admin/applications/class_applicationManagement.inc:324
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#, fuzzy
-msgid "Go to root department"
-msgstr "Lista dei dipartimenti"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+#: plugins/admin/groups/class_groupManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/applications/class_applicationManagement.inc:324
+#: plugins/admin/departments/class_departmentManagement.inc:278
+#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
+#, fuzzy
+msgid "Go to root department"
+msgstr "Lista dei dipartimenti"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2308,9 +2364,9 @@ msgstr "Termina sessione"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2319,10 +2375,10 @@ msgstr "Mostra utenti del dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2341,10 +2397,10 @@ msgstr "Liste di blocco"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 #, fuzzy
@@ -2353,10 +2409,10 @@ msgstr "Password attuale"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #, fuzzy
@@ -2365,10 +2421,10 @@ msgstr "Mostra dipartimenti"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit"
@@ -2376,10 +2432,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
@@ -2387,7 +2443,7 @@ msgid "edit"
 msgstr "Modifica"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2395,10 +2451,10 @@ msgstr "Modifica contatto"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
@@ -2406,7 +2462,7 @@ msgid "delete"
 msgstr "Rimuovi"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2420,10 +2476,10 @@ msgstr "Liste di blocco"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/class_systemManagement.inc:578
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Actions"
@@ -2462,63 +2518,6 @@ msgstr ""
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr "Tipo"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr "Descrizione"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-msgid "Information"
-msgstr "Informazioni"
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr ""
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2574,22 +2573,14 @@ msgstr ""
 msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:48
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:51
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2694,8 +2685,8 @@ msgid "List of predefined blocklists"
 msgstr "Liste di blocco predefinite"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr "Applica"
 
@@ -2809,35 +2800,6 @@ msgstr ""
 msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Rapporti FAX"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2892,70 +2854,48 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Rapporti FAX"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
-msgid "Dial"
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Personale"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Iniziali"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr ""
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Rapporti FAX"
 
-#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privato"
 
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Indirizzo email"
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Organizzazione"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Azienda"
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Città"
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Paese"
-
-#: plugins/addons/addressbook/contents.tpl:15
-msgid "Contact"
-msgstr "Contatto"
+#: plugins/addons/addressbook/contents.tpl:15
+msgid "Contact"
+msgstr "Contatto"
 
 #: plugins/addons/addressbook/contents.tpl:37
 msgid ""
@@ -3011,6 +2951,57 @@ msgstr ""
 msgid "Search string"
 msgstr "Ricerca"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr ""
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personale"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Iniziali"
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "Indirizzo email"
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Organizzazione"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Azienda"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Città"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Paese"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3370,6 +3361,51 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
+msgstr "Gruppo Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
+msgstr "Amministratori di Dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
+msgstr "Utenti di Dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
+msgstr "Ospiti di Dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
+msgstr "Gruppo speciale (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr ""
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr ""
@@ -3394,6 +3430,24 @@ msgstr "Permessi dei membri"
 msgid "Forward messages to non group members"
 msgstr "Inoltra i messaggi ai membri esterni al gruppo"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista dei gruppi"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Questo menù permette di creare, modificare e cancellare i gruppi "
+"selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
+"intervalli in cima alla lista dei gruppi."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Amministrazione dei gruppi di utenti"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3436,7 +3490,7 @@ msgid "Delete this entry"
 msgstr "Rimuovi"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -3455,7 +3509,7 @@ msgid "Groupname"
 msgstr "Nome gruppo"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:645
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3469,74 +3523,15 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Gruppo Samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Amministratori di Dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Utenti di Dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Ospiti di Dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr "Gruppo speciale (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr ""
-
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Amministrazione dei gruppi di utenti"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista dei gruppi"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Questo menù permette di creare, modificare e cancellare i gruppi "
-"selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
-"intervalli in cima alla lista dei gruppi."
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Opzioni applicazione"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3618,7 +3613,7 @@ msgid "Display users of department"
 msgstr "Mostra utenti del dipartimento"
 
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:48
 msgid "Display users matching"
 msgstr "Mostra utenti che corrispondono a"
 
@@ -3685,10 +3680,6 @@ msgstr "Membri del gruppo"
 msgid "Folder administrators"
 msgstr "Amministratori cartella"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opzioni applicazione"
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -3733,134 +3724,157 @@ msgid ""
 "able to login without it."
 msgstr ""
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crea un nuovo utente usando i template"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Continua"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Amministrazione utenti"
+
 #: plugins/admin/users/class_userManagement.inc:25
 msgid "Users"
 msgstr "Utenti"
 
-#: plugins/admin/users/class_userManagement.inc:239
-#: plugins/admin/users/class_userManagement.inc:290
+#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:313
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:326
+#: plugins/admin/users/class_userManagement.inc:349
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:355
+#: plugins/admin/users/class_userManagement.inc:383
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:450
+#: plugins/admin/users/class_userManagement.inc:473
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "Create new user"
 msgstr "Crea in"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "New user"
 msgstr "utenti"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 #, fuzzy
 msgid "password"
 msgstr "Password"
 
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nome utente"
 
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:672
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:703
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:704
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:708
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:710
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:712
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:714
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:868
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
-msgid "Template"
-msgstr ""
+#: plugins/admin/users/class_userManagement.inc:715
+#, fuzzy
+msgid "Create user from template"
+msgstr "Nuovo template"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crea un nuovo utente usando i template"
+#: plugins/admin/users/class_userManagement.inc:716
+#, fuzzy
+msgid "Create user with this template"
+msgstr "Nuovo template"
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+#: plugins/admin/users/class_userManagement.inc:771
+#, fuzzy
+msgid "Online"
+msgstr "nessuno"
+
+#: plugins/admin/users/class_userManagement.inc:778
+msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Continua"
-
 #: plugins/admin/users/remove.tpl:7
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -3930,45 +3944,6 @@ msgstr "Seleziona per vedere gli utenti proxy"
 msgid "Show proxy users"
 msgstr "Mostra utenti proxy"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Amministrazione utenti"
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr ""
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -4027,6 +4002,41 @@ msgstr ""
 msgid "Place entry in members startmenu"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -4058,6 +4068,27 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "new"
+msgstr "Nuovo"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#, fuzzy
+msgid "Create new application"
+msgstr "Crea estensioni per le applicazioni"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr ""
@@ -4082,27 +4113,6 @@ msgstr ""
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
-msgid "You are not allowed to delete this application!"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "new"
-msgstr "Nuovo"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#, fuzzy
-msgid "Create new application"
-msgstr "Crea estensioni per le applicazioni"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -4173,11 +4183,10 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:45
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr ""
 
@@ -4185,27 +4194,6 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr ""
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4249,6 +4237,27 @@ msgstr "dipartimenti"
 msgid ".."
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
+msgstr ""
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4297,6 +4306,10 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
@@ -4420,6 +4433,42 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr ""
@@ -4458,44 +4507,27 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:6
@@ -4520,9 +4552,77 @@ msgstr "Azione"
 msgid "Select action to execute for this server"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "text"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "text"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:64
@@ -4596,10 +4696,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr ""
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr ""
@@ -4613,70 +4709,6 @@ msgstr "Il campo 'Indirizzo principale' non è stao inserito"
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr ""
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr ""
@@ -4697,6 +4729,18 @@ msgid ""
 "below."
 msgstr ""
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr ""
+
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr ""
@@ -4713,197 +4757,184 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemi"
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:339
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Le password nuova e ripetuta non corrispondono"
 
-#: plugins/admin/systems/class_systemManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:396
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:402
-#: plugins/admin/systems/class_systemManagement.inc:466
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
 #, fuzzy
 msgid "New Terminal"
 msgstr "Terminali"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
 #, fuzzy
 msgid "New Workstation"
 msgstr "Mostra workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:559
 #, fuzzy
 msgid "New Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:560
 #, fuzzy
 msgid "New Printer"
 msgstr "Stampante"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:561
 #, fuzzy
 msgid "New Phone"
 msgstr "Telefono"
 
-#: plugins/admin/systems/class_systemManagement.inc:563
+#: plugins/admin/systems/class_systemManagement.inc:562
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-#, fuzzy
-msgid "New system"
-msgstr "Rimuovi"
-
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista dei sistemi"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #, fuzzy
 msgid "Delete system"
 msgstr "Rimuovi"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #, fuzzy
 msgid "System"
 msgstr "Sistemi"
 
-#: plugins/admin/systems/class_systemManagement.inc:584
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 #, fuzzy
 msgid "Cups Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Mostra server"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 #, fuzzy
 msgid "Mail Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 #, fuzzy
 msgid "Imap Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Terminal Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 #, fuzzy
 msgid "Fax Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #, fuzzy
 msgid "Set root password"
 msgstr "Cambia password"
 
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:700
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
 
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:701
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 #, fuzzy
 msgid "Winstation"
 msgstr "Amministrazione"
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 #, fuzzy
 msgid "Network Device"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
 #: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Stampante"
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Terminal Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -4924,29 +4955,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr ""
@@ -5073,14 +5081,6 @@ msgstr ""
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-
 #: plugins/admin/systems/servkolab.tpl:14
 msgid "POP3 service"
 msgstr ""
@@ -5157,98 +5157,16 @@ msgstr ""
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:9
-#, fuzzy
-msgid "Phone type"
-msgstr "Telefono"
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-#, fuzzy
-msgid "Choose a phone type"
-msgstr "Scegli il tuo numero di telefono personale"
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-#, fuzzy
-msgid "Default IP"
-msgstr "Stampante predefinita"
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:121
-#, fuzzy
-msgid "Secret"
-msgstr "Strada"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:150
-#, fuzzy
-msgid "Account code"
-msgstr "Sicurezza"
-
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
-
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr ""
-
-#: plugins/admin/systems/remove.tpl:7
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
+#: plugins/admin/systems/remove.tpl:7
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
+msgstr ""
 
 #: plugins/admin/systems/headpage.tpl:6
 msgid "List of systems"
@@ -5321,30 +5239,19 @@ msgstr ""
 msgid "Show network devices"
 msgstr "Mostra dispositiva di rete"
 
-#: plugins/admin/systems/headpage.tpl:54
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Mostra l'indirizzo dell'utente"
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-#, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr "Il campo 'Indirizzo principale' non è stao inserito"
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr ""
@@ -5520,6 +5427,18 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr "Il campo 'Indirizzo principale' non è stao inserito"
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr ""
@@ -5693,6 +5612,88 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:9
+#, fuzzy
+msgid "Phone type"
+msgstr "Telefono"
+
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+#, fuzzy
+msgid "Choose a phone type"
+msgstr "Scegli il tuo numero di telefono personale"
+
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+#, fuzzy
+msgid "Default IP"
+msgstr "Stampante predefinita"
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+#, fuzzy
+msgid "Secret"
+msgstr "Strada"
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+#, fuzzy
+msgid "Account code"
+msgstr "Sicurezza"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr ""
+
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
 msgid "Terminals"
 msgstr "Terminali"
@@ -5702,14 +5703,6 @@ msgstr "Terminali"
 msgid "Phone queue"
 msgstr "Numero di telefono"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr ""
-
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr ""
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr ""
@@ -5789,57 +5782,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Gruppi di oggetti"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "Account Unix"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "Create new object group"
-msgstr "Gruppo di oggetti"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Nome del gruppo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Gruppo di oggetti"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Gruppo"
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr ""
@@ -5900,25 +5842,64 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Nome del gruppo"
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Gruppi di oggetti"
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Oggetti membri"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr "Account Unix"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
 #, fuzzy
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr "Questa identià possiede estensioni di posta."
+msgid "Create new object group"
+msgstr "Gruppo di oggetti"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
 #, fuzzy
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr "Questa identità non possiede estensioni di posta."
+msgid "Name of object groups"
+msgstr "Nome del gruppo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Gruppo di oggetti"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Gruppo"
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Nome del gruppo"
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Oggetti membri"
 
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
@@ -5968,11 +5949,146 @@ msgstr "Mostra gruppi che contengono terminali"
 msgid "Show groups containing printers"
 msgstr "Mostra gruppi che contengono stampanti"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
 msgid "Display object groups matching"
 msgstr "Mosra gruppi corrispondenti a"
 
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+#, fuzzy
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr "Questa identià possiede estensioni di posta."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+#, fuzzy
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr "Questa identità non possiede estensioni di posta."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "Remove the phone queue from this Account"
+msgstr "Elimina estensioni telefoniche"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+#, fuzzy
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr "Questa identià possiede estensioni telefoniche."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid "Create phone queue"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
+msgstr "Questa identità non possiede estensioni telefoniche"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+#, fuzzy
+msgid "Yes"
+msgstr "Sistemi"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:136
+msgid "ring all available channels until one answers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:137
+msgid "take turns ringing each available interface"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+msgid "ring interface which was least recently called by this queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+msgid "ring the one with fewest completed calls from this queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+msgid "Timeout must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:181
+msgid "Retry must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:184
+msgid "Max queue length must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:187
+msgid "Announce frequency must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:190
+msgid "There must be least one queue number defined."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "Impossibile selezionare il database!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
+#, fuzzy, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr "Impossibile selezionare il database!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgstr ""
+
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
 msgid "Queue Settings"
@@ -5983,7 +6099,7 @@ msgid "Generic queue setup"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
+#: plugins/admin/ogroups/phonequeue.tpl:140
 #, fuzzy
 msgid "Generic queue Settings"
 msgstr "Informazioni generiche"
@@ -6047,214 +6163,237 @@ msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:138
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:135
+#: plugins/admin/ogroups/phonequeue.tpl:143
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
+#: plugins/admin/ogroups/phonequeue.tpl:152
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:160
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "Benvenuto %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:168
 #, fuzzy
 msgid "Announce message"
 msgstr "Messaggio di di risposta automatica"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:176
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:184
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:192
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:200
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:208
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:216
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:224
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "Elimina estensioni telefoniche"
+msgid "no macro"
+msgstr "Rapporti telefono"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
 #, fuzzy
+msgid "undefined"
+msgstr "non definito"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
+msgid "Error while performing query "
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
 msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
+msgstr "Questa identità non possiede estensioni telefoniche"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
+msgstr "Elimina estensioni telefoniche"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr "Questa identià possiede estensioni telefoniche."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid "Create phone queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
 #, fuzzy
 msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
 msgstr "Questa identità non possiede estensioni telefoniche"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:131
-msgid "Uruguai"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
+msgstr "Questa identità non possiede estensioni telefoniche"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "No"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-#, fuzzy
-msgid "Yes"
-msgstr "Sistemi"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:133
-msgid "ring all available channels until one answers"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
-msgid "take turns ringing each available interface"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, php-format
+msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "ring interface which was least recently called by this queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring the one with fewest completed calls from this queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#, php-format
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "ring random interface"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
+#, php-format
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "round robin with memory, remember where we left off last ring pass"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
-msgid "Timeout must be numeric"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
-msgid "Retry must be numeric"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
-msgid "Max queue length must be numeric"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Numeri di telefono"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
-msgid "There must be least one queue number defined."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Inoltra chiamate a"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-#: plugins/admin/ogroups/class_phonequeue.inc:511
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:922
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Numero di telefono"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:221
-#: plugins/admin/ogroups/class_phonequeue.inc:521
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
-#, fuzzy, php-format
-msgid "Can't select database %s on %s."
-msgstr "Impossibile selezionare il database!"
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Timeout"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:255
-#: plugins/admin/ogroups/class_phonequeue.inc:410
-#: plugins/admin/ogroups/class_phonequeue.inc:561
-#, fuzzy, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr "Impossibile selezionare il database!"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+#, fuzzy
+msgid "Phone macro"
+msgstr "Rapporti telefono"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:439
-#: plugins/admin/ogroups/class_phonequeue.inc:441
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:67
+#, fuzzy
+msgid "fill out"
+msgstr "Termina la sessione"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#: plugins/gofon/phoneaccount/generic.tpl:78
 #, fuzzy
-msgid "Phone macros"
+msgid "Phone PIN"
+msgstr "Telefono"
+
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr "Rapporti telefono"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-#, fuzzy
-msgid "You are not allowed to delete this macro!"
-msgstr "Non hai il permesso di cambiare la tua password."
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Crea estensioni telefoniche"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "disabilitato"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Sorgente"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Destinazione"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Nome gruppo"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Pubblico"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Durata"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Pubblico"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Rapporti telefono"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6340,47 +6479,6 @@ msgstr "Lista degli utenti"
 msgid "Macro text"
 msgstr "Nome gruppo"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-#, fuzzy
-msgid "String"
-msgstr "Ricerca"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-#, fuzzy
-msgid "Delete unused"
-msgstr "Rimuovi"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
 #: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
 msgid "List of macros"
@@ -6397,12 +6495,17 @@ msgstr ""
 "selezionati. Avendo un gran numero di gruppi, puoi usare i selettori di "
 "intervalli in cima alla lista dei gruppi."
 
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Mosra gruppi corrispondenti a"
+
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
 msgid "Display macros  matching"
 msgstr "Mosra gruppi corrispondenti a"
 
-#: plugins/gofon/macro/headpage.tpl:44
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
 msgid "Regular expression for matching macro names"
 msgstr "Espressioni regolare per selezionare il nome del gruppo"
@@ -6411,175 +6514,95 @@ msgstr "Espressioni regolare per selezionare il nome del gruppo"
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argomenti"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
-#, fuzzy
-msgid "no macro"
-msgstr "Rapporti telefono"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 #, fuzzy
-msgid "undefined"
-msgstr "non definito"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
-msgid "Error while performing query "
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:492
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
-msgid "This account has no phone extensions."
-msgstr "Questa identità non possiede estensioni telefoniche"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
-msgid "Remove phone account"
-msgstr "Elimina estensioni telefoniche"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:576
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
-msgstr "Questa identià possiede estensioni telefoniche."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:578
-msgid "Create phone account"
-msgstr "Crea estensioni telefoniche"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
-msgstr "Questa identità non possiede estensioni telefoniche"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
-msgid "Please enter a valid phone number!"
-msgstr "Prego inserire un numero di telefono valido!"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-msgid "Choose your private phone"
-msgstr "Scegli il tuo numero di telefono personale"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
-#, php-format
-msgid "You need to specify at least one phone number!"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
-#, php-format
-msgid "You need to specify a Phone PIN."
-msgstr ""
+msgid "String"
+msgstr "Ricerca"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:777
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
-#, php-format
-msgid "The given PIN is too short"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:794
-#, php-format
-msgid "The number '%s' is no valid phone number!"
-msgstr ""
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#, fuzzy
+msgid "Delete unused"
+msgstr "Rimuovi"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
-msgid "Stop"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Numeri di telefono"
-
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Inoltra chiamate a"
-
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Numero di telefono"
-
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Timeout"
-
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "Phone macro"
+msgid "Phone macros"
 msgstr "Rapporti telefono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:77
-#, fuzzy
-msgid "Phone PIN"
-msgstr "Telefono"
-
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Rapporti telefono"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#, fuzzy
+msgid "You are not allowed to delete this macro!"
+msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Crea estensioni telefoniche"
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "disabilitato"
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Sorgente"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Nome gruppo"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Destinazione"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Pubblico"
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr ""
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Pubblico"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Durata"
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argomenti"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Rapporti telefono"
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6625,31 +6648,6 @@ msgstr "Il team di GOsa"
 msgid "Welcome %s!"
 msgstr "Benvenuto %s!"
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-#, fuzzy
-msgid "Can't create/open File"
-msgstr "File di configurazione"
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr ""
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -6846,40 +6844,151 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_password-methods.inc:165
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"Stai modificando un campo del database. Vuoi abbandonare i cambiamenti?"
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr ""
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr ""
+
+#: include/class_plugin.inc:398
 #, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:426
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/class_pluglist.inc:98
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_ldap.inc:438
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+
+#: include/class_ldap.inc:671
+#, 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:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+#, fuzzy
+msgid "Can't create/open File"
+msgstr "File di configurazione"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
-"Stai modificando un campo del database. Vuoi abbandonare i cambiamenti?"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7309,92 +7418,6 @@ msgstr ""
 "Manca un utente amministrativo per GOsa, non sarai in grado di amministrare "
 "niente!"
 
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr ""
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr ""
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
-#: include/class_ldap.inc:438
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-
-#: include/class_ldap.inc:671
-#, 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:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:700
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr ""
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr ""
-
-#: include/class_plugin.inc:398
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:454
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr ""
@@ -7436,6 +7459,26 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
+#: html/main.php:96
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+
+#: html/main.php:139
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+
+#: html/main.php:263
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:292
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7478,24 +7521,27 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/main.php:96
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
 msgstr ""
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
 msgstr ""
 
-#: html/main.php:292
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
@@ -7520,6 +7566,23 @@ msgstr ""
 msgid "Logout"
 msgstr "Termina sessione"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr "Usa il tuo <i>nome utente</i> e <i>password</i> per connetterti"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr "Directory"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Entra"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Clicca qui per connetterti"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7542,63 +7605,6 @@ msgstr ""
 "i programmi necessari e opzionali, e in fine passeremo alle impostazioni del "
 "server LDAP."
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-"Per amministrare GOsa devi creare un gruppo speciale che contine l'utente "
-"aministrativo. La procedura di setup ti aiuterà nel compito.Immetti il nome "
-"utente e la password per creare le entrate mancanti."
-
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr "Usa il tuo <i>nome utente</i> e <i>password</i> per connetterti"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr "Directory"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Entra"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Clicca qui per connetterti"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7619,17 +7625,6 @@ msgstr "Termina la sessione"
 msgid "Signed in:"
 msgstr "Connesso:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Rilevato un conflitto di accesso"
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -7646,6 +7641,34 @@ msgid ""
 "correct minimum version."
 msgstr "In questo secondo passo cercheremo i programmi necessari e opzionali."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Rilevato un conflitto di accesso"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+"Per amministrare GOsa devi creare un gruppo speciale che contine l'utente "
+"aministrativo. La procedura di setup ti aiuterà nel compito.Immetti il nome "
+"utente e la password per creare le entrate mancanti."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -7871,6 +7894,10 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "New system"
+#~ msgstr "Rimuovi"
+
 #, fuzzy
 #~ msgid "Germany"
 #~ msgstr "Tedesco"

diff --git a/locale/messages.po b/locale/messages.po
index 08b01f128466a08fee3e88f57d58aad0d545eb40..bf1846347937f6ffb5cef93825346831b4ba5f31 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -31,7 +31,7 @@ msgstr ""
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -40,7 +40,7 @@ msgstr ""
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:713
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -55,22 +55,22 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:711
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr ""
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:709
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:507
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
 msgid "Parameter"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:131
+#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "German"
 msgstr ""
 
@@ -174,13 +174,152 @@ msgstr ""
 msgid "Italian"
 msgstr ""
 
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:703
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -215,14 +354,14 @@ msgstr ""
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -233,14 +372,14 @@ msgstr ""
 #: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:660
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr ""
@@ -261,13 +400,13 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
 #: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:21 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr ""
 
@@ -351,211 +490,71 @@ msgstr ""
 msgid "disables all Mail options!"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:610
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:529
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:587
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:528
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:51
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:530
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr ""
-
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
-#: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
-msgid "Click the 'Edit' button below to change informations in this dialog"
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
+#: plugins/personal/connectivity/main.inc:126
+#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/gofon/phoneaccount/main.inc:111
+msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
@@ -600,8 +599,8 @@ msgid "Display addresses of department"
 msgstr ""
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
@@ -634,20 +633,20 @@ msgid "User name of which addresses are shown"
 msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "Change password"
 msgstr ""
 
@@ -702,8 +701,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -726,14 +725,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:256
+#: plugins/admin/users/class_userManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:265
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -753,6 +752,19 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr ""
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr ""
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr ""
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr ""
@@ -812,22 +824,22 @@ msgid "Display groups of department"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr ""
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:80
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr ""
 
@@ -840,19 +852,6 @@ msgstr ""
 msgid "Password expires on"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr ""
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr ""
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Display systems matching"
-msgstr ""
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -912,6 +911,10 @@ msgstr ""
 msgid "System trust"
 msgstr ""
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr ""
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -928,7 +931,7 @@ msgstr ""
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:202
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
 msgid "automatic"
 msgstr ""
 
@@ -1203,10 +1206,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr ""
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr ""
@@ -1333,6 +1332,10 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr ""
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr ""
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr ""
@@ -1345,10 +1348,6 @@ msgstr ""
 msgid "Display workstations matching"
 msgstr ""
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr ""
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr ""
@@ -1441,70 +1440,198 @@ msgid ""
 "possible!"
 msgstr ""
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
 msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
-msgid "Name"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:23
-msgid "Given name"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
-msgid "Login"
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:50
-msgid "Academic title"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:58
-msgid "Date of birth"
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:528
+msgid "The required field 'Name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "The required field 'Given name' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr ""
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+msgid "Name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:30
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:23
+msgid "Given name"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+msgid "Login"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:42
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:50
+msgid "Academic title"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:58
+msgid "Date of birth"
+msgstr ""
+
+#: plugins/personal/generic/generic.tpl:75
 #: ihtml/themes/altlinux/sizelimit.tpl:14
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
@@ -1583,9 +1710,9 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1611,8 +1738,8 @@ msgid "Room No."
 msgstr ""
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr ""
@@ -1689,6 +1816,15 @@ msgstr ""
 msgid "Public visible"
 msgstr ""
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr ""
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr ""
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -1699,7 +1835,7 @@ msgstr ""
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr ""
@@ -1716,173 +1852,118 @@ msgstr ""
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
-msgid "No certificate installed"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:505
-msgid "The required field 'Name' is not set."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
+msgid ""
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:508
-msgid "The required field 'Given name' is not set."
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
+msgid ""
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:912
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:919
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1070
-msgid "Could not open specified certificate!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr ""
-
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
@@ -1937,6 +2018,41 @@ msgstr ""
 msgid "Invitation policy"
 msgstr ""
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr ""
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr ""
@@ -2018,6 +2134,14 @@ msgstr ""
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr ""
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2059,129 +2183,61 @@ msgstr ""
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+msgid "Information"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
@@ -2203,10 +2259,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Go up one department"
@@ -2214,10 +2270,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
@@ -2226,10 +2282,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:357
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 msgid "Go to root department"
@@ -2237,10 +2293,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 msgid "Root"
@@ -2248,9 +2304,9 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 msgid "Go to users department"
@@ -2258,10 +2314,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 msgid "Home"
@@ -2277,10 +2333,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 msgid "Current base"
@@ -2288,10 +2344,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit department"
@@ -2299,10 +2355,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit"
@@ -2310,34 +2366,34 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr ""
@@ -2349,10 +2405,10 @@ msgstr ""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/class_systemManagement.inc:578
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Actions"
@@ -2391,63 +2447,6 @@ msgstr ""
 msgid "No permission to create a blocklist on this base."
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-msgid "Information"
-msgstr ""
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr ""
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2501,22 +2500,14 @@ msgstr ""
 msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:48
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:51
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2621,8 +2612,8 @@ msgid "List of predefined blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr ""
 
@@ -2736,35 +2727,6 @@ msgstr ""
 msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2819,67 +2781,45 @@ msgstr ""
 msgid "Search returned no results..."
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
-msgid "Dial"
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr ""
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr ""
 
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr ""
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr ""
@@ -2935,6 +2875,57 @@ msgstr ""
 msgid "Search string"
 msgstr ""
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr ""
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr ""
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr ""
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3294,41 +3285,101 @@ msgstr ""
 msgid "System log view"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:11
-msgid "Primary mail address for this shared folder"
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:66
-msgid "IMAP shared folders"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:70
-msgid "Default permission"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:79
-msgid "Member permission"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/mail.tpl:94
-msgid "Forward messages to non group members"
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42
-msgid "Groups"
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:273
-#, php-format
-msgid "You're about to delete the group '%s'."
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:279
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:11
+msgid "Primary mail address for this shared folder"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:66
+msgid "IMAP shared folders"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:70
+msgid "Default permission"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:79
+msgid "Member permission"
+msgstr ""
+
+#: plugins/admin/groups/mail.tpl:94
+msgid "Forward messages to non group members"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr ""
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42
+msgid "Groups"
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:273
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupManagement.inc:279
 #: plugins/admin/groups/class_groupManagement.inc:305
 msgid "You are not allowed to delete this group!"
 msgstr ""
@@ -3357,7 +3408,7 @@ msgid "Delete this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:705
 msgid "Posix"
 msgstr ""
 
@@ -3374,7 +3425,7 @@ msgid "Groupname"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:645
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3388,70 +3439,14 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr ""
-
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:153
@@ -3532,7 +3527,7 @@ msgid "Display users of department"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:48
 msgid "Display users matching"
 msgstr ""
 
@@ -3597,10 +3592,6 @@ msgstr ""
 msgid "Folder administrators"
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr ""
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr ""
@@ -3645,122 +3636,142 @@ msgid ""
 "able to login without it."
 msgstr ""
 
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr ""
+
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr ""
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr ""
+
 #: plugins/admin/users/class_userManagement.inc:25
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:239
-#: plugins/admin/users/class_userManagement.inc:290
+#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:313
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:326
+#: plugins/admin/users/class_userManagement.inc:349
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:355
+#: plugins/admin/users/class_userManagement.inc:383
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:450
+#: plugins/admin/users/class_userManagement.inc:473
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:672
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:703
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:706
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:708
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:710
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:712
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:714
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:868
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
-msgid "Template"
+#: plugins/admin/users/class_userManagement.inc:715
+msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/users/class_userManagement.inc:716
+msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+#: plugins/admin/users/class_userManagement.inc:771
+msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
+#: plugins/admin/users/class_userManagement.inc:778
+msgid "Offline"
 msgstr ""
 
 #: plugins/admin/users/remove.tpl:7
@@ -3829,45 +3840,6 @@ msgstr ""
 msgid "Show proxy users"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr ""
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -3926,6 +3898,41 @@ msgstr ""
 msgid "Place entry in members startmenu"
 msgstr ""
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr ""
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -3957,7 +3964,26 @@ msgstr ""
 msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "new"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+msgid "Create new application"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr ""
 
@@ -3981,25 +4007,6 @@ msgstr ""
 msgid "There's already an application with this 'Name'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
-msgid "You are not allowed to delete this application!"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "new"
-msgstr ""
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-msgid "Create new application"
-msgstr ""
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr ""
@@ -4070,11 +4077,10 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:45
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr ""
 
@@ -4082,27 +4088,6 @@ msgstr ""
 msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr ""
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4142,6 +4127,27 @@ msgstr ""
 msgid ".."
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
+msgstr ""
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4190,6 +4196,10 @@ msgstr ""
 msgid "MAC-address"
 msgstr ""
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
@@ -4312,6 +4322,42 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr ""
@@ -4350,44 +4396,27 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 msgstr ""
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr ""
-
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
 #: plugins/admin/systems/server.tpl:6
@@ -4412,6 +4441,74 @@ msgstr ""
 msgid "Select action to execute for this server"
 msgstr ""
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr ""
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4488,10 +4585,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr ""
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr ""
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr ""
@@ -4504,88 +4597,36 @@ msgstr ""
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
+#: plugins/admin/systems/class_servDHCP.inc:33
+msgid "Remove DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
+#: plugins/admin/systems/class_servDHCP.inc:34
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_servDHCP.inc:33
-msgid "Remove DHCP service"
-msgstr ""
-
-#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:37
 msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
+"This server has DHCP features disabled. You can enable them by clicking "
 "below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Add DHCP service"
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
 msgstr ""
 
 #: plugins/admin/systems/class_workstationGeneric.inc:136
@@ -4604,174 +4645,162 @@ msgstr ""
 msgid "Systems"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:339
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:396
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:402
-#: plugins/admin/systems/class_systemManagement.inc:466
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 msgid "You are not allowed to delete this component!"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
 msgid "New Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:559
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
 msgid "New Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:559
 msgid "New Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:560
 msgid "New Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:561
 msgid "New Phone"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:563
+#: plugins/admin/systems/class_systemManagement.inc:562
 msgid "New Component"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "New system"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "Edit system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "Delete system"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 msgid "System"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:584
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 msgid "Cups Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 msgid "Syslog Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 msgid "Mail Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 msgid "Imap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 msgid "Nfs Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 msgid "Kerberos Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 msgid "Asterisk Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 msgid "Fax Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 msgid "Ldap Server"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 msgid "Set root password"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:700
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 msgid "Terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:701
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 msgid "Winstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 msgid "Network Device"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
 #: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 msgid "Terminal template for"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -4792,29 +4821,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr ""
@@ -4941,14 +4947,6 @@ msgstr ""
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr ""
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-
 #: plugins/admin/systems/servkolab.tpl:14
 msgid "POP3 service"
 msgstr ""
@@ -5025,83 +5023,6 @@ msgstr ""
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-msgid "Choose a phone type"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
-
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
 msgstr ""
@@ -5184,28 +5105,18 @@ msgstr ""
 msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:54
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-msgid "The required field 'MAC-address' is not set."
-msgstr ""
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-msgid "The required field 'IP-address' is not set."
-msgstr ""
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr ""
@@ -5381,6 +5292,16 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+msgid "The required field 'MAC-address' is not set."
+msgstr ""
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'IP-address' is not set."
+msgstr ""
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr ""
@@ -5550,20 +5471,89 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+msgid "Choose a phone type"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
@@ -5645,55 +5635,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "Create new object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Name of object groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr ""
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr ""
@@ -5754,22 +5695,61 @@ msgstr ""
 msgid "You can combine two different object types at maximum only!"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+msgid "Create new object group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Name of object groups"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr ""
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
 msgstr ""
 
 #: plugins/admin/ogroups/remove.tpl:7
@@ -5817,575 +5797,612 @@ msgstr ""
 msgid "Show groups containing printers"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 msgid "Display object groups matching"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Generic queue Settings"
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-msgid "Phone Number"
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:23
-msgid "Down"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+msgid "Remove the phone queue from this Account"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
-msgid "Timeout"
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+msgid "Create phone queue"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
-msgid "Strategy"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
-msgid "Max queue length"
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
-msgid "(in seconds)"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "Yes"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
-msgid "Announce holdtime"
+#: plugins/admin/ogroups/class_phonequeue.inc:136
+msgid "ring all available channels until one answers"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
-msgid "Allow the called user to transfer his call"
+#: plugins/admin/ogroups/class_phonequeue.inc:137
+msgid "take turns ringing each available interface"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
-msgid "Allows calling user to transfer call"
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+msgid "ring interface which was least recently called by this queue"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
-msgid "Allow the called to hangup by pressing *"
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+msgid "ring the one with fewest completed calls from this queue"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
-msgid "Allows calling to hangup by pressing *"
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
-msgid "Queue sound file setup"
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:135
-msgid "Use music on hold instead of ringing"
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
-msgid "Music on hold"
+#: plugins/admin/ogroups/class_phonequeue.inc:181
+msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
-msgid "Welcome sound file"
+#: plugins/admin/ogroups/class_phonequeue.inc:184
+msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
-msgid "Announce message"
+#: plugins/admin/ogroups/class_phonequeue.inc:187
+msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
-msgid "Sound file for 'You are next ...'"
+#: plugins/admin/ogroups/class_phonequeue.inc:190
+msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
-msgid "'There are ...'"
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
-msgid "'... calls waiting'"
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, php-format
+msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
-msgid "'Thank you' message"
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
+#, php-format
+msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
-msgid "'minutes' sound file"
+#: plugins/admin/ogroups/class_phonequeue.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
-msgid "'seconds' sound file"
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
-msgid "Hold sound file"
+#: plugins/admin/ogroups/phonequeue.tpl:6
+msgid "Generic queue setup"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-msgid "Remove the phone queue from this Account"
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:11
+msgid "Phone Number"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-msgid "Create phone queue"
+#: plugins/admin/ogroups/phonequeue.tpl:23
+msgid "Down"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:39
+msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:131
-msgid "Uruguai"
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "No"
+#: plugins/admin/ogroups/phonequeue.tpl:55
+msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "Yes"
+#: plugins/admin/ogroups/phonequeue.tpl:67
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:133
-msgid "ring all available channels until one answers"
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
-msgid "take turns ringing each available interface"
+#: plugins/admin/ogroups/phonequeue.tpl:79
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "ring interface which was least recently called by this queue"
+#: plugins/admin/ogroups/phonequeue.tpl:84
+msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring the one with fewest completed calls from this queue"
+#: plugins/admin/ogroups/phonequeue.tpl:98
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "ring random interface"
+#: plugins/admin/ogroups/phonequeue.tpl:106
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "round robin with memory, remember where we left off last ring pass"
+#: plugins/admin/ogroups/phonequeue.tpl:114
+msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
-msgid "Timeout must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:122
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
-msgid "Retry must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
-msgid "Max queue length must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:138
+msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
-msgid "Announce frequency must be numeric"
+#: plugins/admin/ogroups/phonequeue.tpl:143
+msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
-msgid "There must be least one queue number defined."
+#: plugins/admin/ogroups/phonequeue.tpl:152
+msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-#: plugins/admin/ogroups/class_phonequeue.inc:511
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:922
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+#: plugins/admin/ogroups/phonequeue.tpl:160
+msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:221
-#: plugins/admin/ogroups/class_phonequeue.inc:521
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
-#, php-format
-msgid "Can't select database %s on %s."
+#: plugins/admin/ogroups/phonequeue.tpl:168
+msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:255
-#: plugins/admin/ogroups/class_phonequeue.inc:410
-#: plugins/admin/ogroups/class_phonequeue.inc:561
-#, php-format
-msgid "Can't delete in Database %s, on Server %s."
+#: plugins/admin/ogroups/phonequeue.tpl:176
+msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:439
-#: plugins/admin/ogroups/class_phonequeue.inc:441
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:184
+msgid "'There are ...'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/admin/ogroups/phonequeue.tpl:192
+msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:200
+msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
+#: plugins/admin/ogroups/phonequeue.tpl:208
+msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
+#: plugins/admin/ogroups/phonequeue.tpl:216
+msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Hold sound file"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-msgid "Macro"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "visible"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "invisible"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
+msgid "Error while performing query "
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:91
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
-msgid "This 'dn' is no phone macro."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:147
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
 msgid ""
-"This macro ist still in use. To delete this Macro ensure that nobody has "
-"selected this Macro."
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+msgid ""
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
 #, php-format
-msgid "Unable to parse macro contents on line: %s"
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:250
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
 #, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:259
-#: plugins/gofon/macro/class_gofonMacro.inc:267
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
 #, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:281
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:323
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
-msgid "The given cn '%s' already exists."
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:328
-msgid "You must specify the 'Display Name' in order to save this macro"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
-msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:337
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:343
-msgid "Makro length must be lower than 100 lines"
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:348
-msgid "Please choose a valid  base."
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "fill out"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
-msgid "Display macros  matching"
+#: plugins/gofon/macro/class_gofonMacro.inc:147
+msgid ""
+"This macro ist still in use. To delete this Macro ensure that nobody has "
+"selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:44
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#, php-format
+msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/macro/class_gofonMacro.inc:250
+#, php-format
+msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/macro/class_gofonMacro.inc:259
+#: plugins/gofon/macro/class_gofonMacro.inc:267
+#, php-format
+msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/macro/class_gofonMacro.inc:281
+#, php-format
+msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
-msgid "no macro"
+#: plugins/gofon/macro/class_gofonMacro.inc:323
+#, php-format
+msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
-msgid "undefined"
+#: plugins/gofon/macro/class_gofonMacro.inc:328
+msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
-msgid "Error while performing query "
+#: plugins/gofon/macro/class_gofonMacro.inc:332
+msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:492
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+#: plugins/gofon/macro/class_gofonMacro.inc:337
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
-msgid "This account has no phone extensions."
+#: plugins/gofon/macro/class_gofonMacro.inc:343
+msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
-msgid "Remove phone account"
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:576
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:578
-msgid "Create phone account"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
-msgid "Please enter a valid phone number!"
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-msgid "Choose your private phone"
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
-#, php-format
-msgid "You need to specify at least one phone number!"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
-#, php-format
-msgid "You need to specify a Phone PIN."
+#: plugins/gofon/macro/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:777
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
-#, php-format
-msgid "The given PIN is too short"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:794
-#, php-format
-msgid "The number '%s' is no valid phone number!"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
-#, php-format
-msgid "The timeout '%s' contains invalid characters!"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
-msgid "Stop"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
-#, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
-msgid "Phone macro"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:77
-msgid "Phone PIN"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:46
@@ -6426,30 +6443,6 @@ msgstr ""
 msgid "Welcome %s!"
 msgstr ""
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr ""
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr ""
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -6644,38 +6637,147 @@ msgstr ""
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr ""
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr ""
+
+#: include/class_plugin.inc:398
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr ""
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr ""
+
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_ldap.inc:438
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+
+#: include/class_ldap.inc:671
+#, 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:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
 msgstr ""
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:426
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
 msgstr ""
 
-#: include/class_password-methods.inc:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
 #: include/functions_setup.inc:98
@@ -7065,91 +7167,6 @@ msgid ""
 "administrate anything!"
 msgstr ""
 
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr ""
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr ""
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
-#: include/class_ldap.inc:438
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-
-#: include/class_ldap.inc:671
-#, 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:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
-
-#: include/class_ldap.inc:700
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr ""
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr ""
-
-#: include/class_plugin.inc:398
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-
-#: include/class_plugin.inc:454
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr ""
@@ -7191,6 +7208,26 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
+#: html/main.php:96
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+
+#: html/main.php:139
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+
+#: html/main.php:263
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr ""
+
+#: html/main.php:292
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7232,24 +7269,27 @@ msgstr ""
 msgid "Enter SSL session"
 msgstr ""
 
-#: html/main.php:96
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
 msgstr ""
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
 msgstr ""
 
-#: html/main.php:292
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
@@ -7274,36 +7314,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-
 #: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
@@ -7321,27 +7331,20 @@ msgstr ""
 msgid "Click here to log in"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr ""
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
 msgstr ""
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
 msgstr ""
 
 #: ihtml/themes/altlinux/framework.tpl:15
@@ -7364,17 +7367,6 @@ msgstr ""
 msgid "Signed in:"
 msgstr ""
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr ""
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -7391,6 +7383,31 @@ msgid ""
 "correct minimum version."
 msgstr ""
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr ""
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index 342efccdecb01496683714859ac6624154b68d70..7a2ad5e6aef8d6df7dac502a3c23d76c65939d15 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -52,7 +52,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -61,7 +61,7 @@ msgstr "E-mail"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:713
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -76,22 +76,22 @@ msgstr "Verbindingen"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:711
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:709
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -122,7 +122,7 @@ msgstr "Rechten"
 msgid "Options"
 msgstr "Opties"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:507
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
 msgid "Parameter"
 msgstr "Parameters"
 
@@ -167,7 +167,7 @@ msgstr "CSV Import"
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:131
+#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "German"
 msgstr "Duits"
 
@@ -195,13 +195,166 @@ msgstr "Engels"
 msgid "Italian"
 msgstr "Italiaans"
 
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Dit doet iets"
+
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "De E-mail methode '%s' opgegeven in uw gosa.conf is niet beschikbaar."
+
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
+
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "E-mail account verwijderen"
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "E-mail account aanmaken"
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Het toevoegen van een van uw eigen adressen aan de lijst met doorstuur "
+"adressen is niet logisch."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"U probeert een ongeldig E-mail adres toe te voegen aan de lijst met "
+"alternatieve adressen."
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+"Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+"Er is geen geldige mailserver gespecificeerd. Voeg er a.u.b. een toe in de "
+"systeem instellingen."
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr "Het vereiste veld 'Primair adres' is leeg."
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr "Het primaire adres dat u opgegeven heeft wordt al gebruikt."
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Geef a.u.b. een geldige E-mail grootte op voor af te wijzen E-mails."
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+"U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
+"afwijzen."
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Primair adres"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:703
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -236,14 +389,14 @@ msgstr "Lijst met alternatieve E-mail adressen"
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -254,14 +407,14 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:660
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "Toevoegen"
@@ -282,13 +435,13 @@ msgstr "Toevoegen"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
 #: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:21 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -376,183 +529,29 @@ msgstr "Gebruik een eigen sieve script"
 msgid "disables all Mail options!"
 msgstr "schakelt alle E-mail opties uit!"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Dit doet iets"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "De E-mail methode '%s' opgegeven in uw gosa.conf is niet beschikbaar."
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "Er is geen DESC variabele aanwezig in het afwezigheidsbestand:"
-
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "E-mail account verwijderen"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "E-mail account aanmaken"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
-"knop hieronder te gebruiken."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"U probeert een ongeldig email adres toe te voegen aan de doorstuurlijst."
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Het toevoegen van een van uw eigen adressen aan de lijst met doorstuur "
-"adressen is niet logisch."
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"U probeert een ongeldig E-mail adres toe te voegen aan de lijst met "
-"alternatieve adressen."
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-"Het adres dat u probeert toe te voegen wordt al gebruikt door gebruiker"
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-"Er is geen geldige mailserver gespecificeerd. Voeg er a.u.b. een toe in de "
-"systeem instellingen."
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr "Het vereiste veld 'Primair adres' is leeg."
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr "Het primaire adres dat u opgegeven heeft wordt al gebruikt."
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Geef a.u.b. een geldige E-mail grootte op voor af te wijzen E-mails."
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-"U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
-"afwijzen."
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr "U heeft Spam instellingen opgegeven, maar geen mailfolder opgegeven."
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:587
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:528
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr "Opslaan"
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:610
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
+msgstr "Opslaan"
 
 #: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:31
 #: plugins/personal/generic/generic_certs.tpl:78
@@ -567,24 +566,24 @@ msgstr "Opslaan"
 #: plugins/addons/addressbook/remove.tpl:17
 #: plugins/admin/groups/class_groupManagement.inc:330
 #: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:51
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
 #: plugins/admin/departments/remove.tpl:17
 #: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:530
+#: plugins/admin/systems/class_systemManagement.inc:529
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Annuleren"
@@ -641,8 +640,8 @@ msgid "Display addresses of department"
 msgstr "Toon adressen van afdeling"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
@@ -675,20 +674,20 @@ msgid "User name of which addresses are shown"
 msgstr "Gebruikersnaam van wie de adressen getoond worden"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Wachtwoord"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
@@ -750,8 +749,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -776,7 +775,7 @@ 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/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:256
+#: plugins/admin/users/class_userManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -785,7 +784,7 @@ msgstr ""
 "overeen."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:265
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
@@ -806,6 +805,19 @@ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Selecteer de toe te voegen systemen"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Toon systemen van afdeling"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Toon de overeenkomende systemen"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Selecteer de toe te voegen groepen"
@@ -867,22 +879,22 @@ msgid "Display groups of department"
 msgstr "Toon groepen van afdeling"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Toon overeenkomende groepen"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Reguliere expressie voor overeenkomende groepnamen"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr "Toon groepen van gebruiker"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:80
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Gebruikersnaam van wie de groepen getoond worden"
 
@@ -895,19 +907,6 @@ msgstr "Gebruiker moet het wachtwoord bij de eerste aanmelding veranderen"
 msgid "Password expires on"
 msgstr "Het wachtwoord verloopt op"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Selecteer de toe te voegen systemen"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Toon systemen van afdeling"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Display systems matching"
-msgstr "Toon de overeenkomende systemen"
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -967,6 +966,10 @@ msgstr "Standaard taal"
 msgid "System trust"
 msgstr "Systeem vertrouwen"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Unix instellingen"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -983,7 +986,7 @@ msgstr "niet geconfigureerd"
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:202
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
 msgid "automatic"
 msgstr "automatisch"
 
@@ -1272,10 +1275,6 @@ msgid "Too many users, can't allocate a free ID!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Unix instellingen"
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Samba home"
@@ -1404,6 +1403,10 @@ msgstr "Het account verloopt na   "
 msgid "Allow connection from these workstations only"
 msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Samba Instellingen"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecteer de toe te voegen werkstations"
@@ -1416,10 +1419,6 @@ msgstr "Toon werkstations van afdeling"
 msgid "Display workstations matching"
 msgstr "Toon de overeenkomende werkstations"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Samba Instellingen"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Dit account heeft geen samba extensies."
@@ -1525,81 +1524,219 @@ msgstr ""
 "Waarschuwing: Kan de primaire groep van de gebruiker niet identificeren - Er "
 "is geen conversie naar een Samba groep mogelijk!"
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"U heeft de manier waarop uw wachtwoord wordt opgeslagen in de LDAP database "
-"veranderd. Daarom moet u het wachtwoord op dit moment opnieuw invoeren. GOsa "
-"zal dan het wachtwoord versleutelen op de door u geselecteerde methode."
-
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Persoonlijk plaatje"
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "vrouw"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Plaatje verwijderen"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "man"
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Opslaan"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Dit account heeft geen geldige GOsa extensies."
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Persoonlijke informatie"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Het opgegeven bestand is niet opgestuurd via HTTP POST! Aktie afgebroken."
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
-msgstr "Verander plaatje"
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr "Geef a.u.b. een geldig serienummer op"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
-msgid "Name"
-msgstr "(Achter)naam"
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
+"Certificaat is geldig van <b>%s</b> tot <b>%s</b> en de huidige status is <b>"
+"%s</b>."
 
-#: plugins/personal/generic/generic.tpl:30
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/admin/users/template.tpl:23
-msgid "Given name"
-msgstr "Voornaam"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr "geldig"
 
-#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
-msgid "Login"
-msgstr "Inlognaam"
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr "ongeldig"
 
-#: plugins/personal/generic/generic.tpl:42
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:22
-msgid "Personal title"
-msgstr "Persoonlijke titel"
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
+msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/generic.tpl:50
-msgid "Academic title"
-msgstr "Academische titel"
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr "Kerberos database communicatie is mislukt"
 
-#: plugins/personal/generic/generic.tpl:58
-msgid "Date of birth"
-msgstr "Geboortedatum"
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
 
-#: plugins/personal/generic/generic.tpl:75
-#: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14
-msgid "Set"
-msgstr "Stel in"
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
 
-#: plugins/personal/generic/generic.tpl:81
-msgid "Sex"
-msgstr "Geslacht"
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+"U heeft geen toestemming om een gebruiker te verplaatsen vanuit de originale "
+"'Basis'."
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:528
+msgid "The required field 'Name' is not set."
+msgstr "Het vereiste veld '(Achter)naam' is leeg."
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "The required field 'Given name' is not set."
+msgstr "Het vereiste veld 'Voornaam' is leeg."
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr "Het vereiste veld 'Inlog naam' is leeg."
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
+"de database."
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
+"liggende streepjes zijn toegestaan."
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Het veld 'Website' bevat een ongeldige URL."
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr "Het veld 'Naam' bevat ongeldige karakters."
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr "Het opgegeven certificaat kon geopend worden!"
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"U heeft de manier waarop uw wachtwoord wordt opgeslagen in de LDAP database "
+"veranderd. Daarom moet u het wachtwoord op dit moment opnieuw invoeren. GOsa "
+"zal dan het wachtwoord versleutelen op de door u geselecteerde methode."
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Persoonlijke informatie"
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Persoonlijk plaatje"
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr "Verander plaatje"
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+msgid "Name"
+msgstr "(Achter)naam"
+
+#: plugins/personal/generic/generic.tpl:30
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:23
+msgid "Given name"
+msgstr "Voornaam"
+
+#: plugins/personal/generic/generic.tpl:34 plugins/admin/users/template.tpl:28
+msgid "Login"
+msgstr "Inlognaam"
+
+#: plugins/personal/generic/generic.tpl:42
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:22
+msgid "Personal title"
+msgstr "Persoonlijke titel"
+
+#: plugins/personal/generic/generic.tpl:50
+msgid "Academic title"
+msgstr "Academische titel"
+
+#: plugins/personal/generic/generic.tpl:58
+msgid "Date of birth"
+msgstr "Geboortedatum"
+
+#: plugins/personal/generic/generic.tpl:75
+#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14
+msgid "Set"
+msgstr "Stel in"
+
+#: plugins/personal/generic/generic.tpl:81
+msgid "Sex"
+msgstr "Geslacht"
 
 #: plugins/personal/generic/generic.tpl:92
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
@@ -1670,9 +1807,9 @@ msgstr "Organisatie"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1698,8 +1835,8 @@ msgid "Room No."
 msgstr "Kamer nr."
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "GSM"
@@ -1776,6 +1913,15 @@ msgstr "Laatste levering"
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Plaatje verwijderen"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Opslaan"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Standaard certificaat"
@@ -1786,7 +1932,7 @@ msgstr "Standaard certificaat"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Verwijderen"
@@ -1803,186 +1949,124 @@ msgstr "PKCS12 certificaat"
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr "vrouw"
-
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr "man"
-
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr "Dit account heeft geen geldige GOsa extensies."
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Het opgegeven bestand is niet opgestuurd via HTTP POST! Aktie afgebroken."
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Algemene gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr "Geef a.u.b. een geldig serienummer op"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "Ftp"
 
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
-"Certificaat is geldig van <b>%s</b> tot <b>%s</b> en de huidige status is <b>"
-"%s</b>."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "De opgegeven waarde voor 'Verstuur Bandbreedte' is niet geldig."
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr "geldig"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "De opgegeven waarde voor 'Ontvangst bandbreedte' is niet geldig."
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr "ongeldig"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "De opgegeven waarde voor 'Bestanden' is niet geldig."
 
-#: plugins/personal/generic/class_user.inc:408
-msgid "No certificate installed"
-msgstr "Geen certificaat geinstalleerd"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "De opgegeven waarde voor 'Grootte' is niet geldig."
 
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr "Kerberos database communicatie is mislukt"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "De opgegeven waarde voor 'Verhouding' is niet geldig."
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Proxy account"
 
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
-"U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
+"Filter ongewilde inhoud (bijvoorbeeld pornografische of geweld gerelateerde "
+"inhoud)"
 
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-"U heeft geen toestemming om een gebruiker te verplaatsen vanuit de originale "
-"'Basis'."
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Beperk proxy gebruik tot werktijd"
 
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:505
-msgid "The required field 'Name' is not set."
-msgstr "Het vereiste veld '(Achter)naam' is leeg."
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
-msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Beperk proxy gebruik met quota"
 
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:508
-msgid "The required field 'Given name' is not set."
-msgstr "Het vereiste veld 'Voornaam' is leeg."
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "per"
 
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
-msgstr "Het vereiste veld 'Inlog naam' is leeg."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr "Kolab"
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
 msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
-"Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
-"de database."
+"U probeert een ongeldig email adres toe te voegen aan de delegatielijst."
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
 msgstr ""
-"Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
-"liggende streepjes zijn toegestaan."
-
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Het veld 'Website' bevat een ongeldige URL."
-
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
-msgstr "Het veld 'Naam' bevat ongeldige karakters."
-
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
-
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
-
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
-
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
+"Het E-mail adres dat u probeert toe te voegen is geen primair E-mail adres "
+"van een bestaande gebruiker."
 
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr "Altijd accepteren"
 
-#: plugins/personal/generic/class_user.inc:1070
-msgid "Could not open specified certificate!"
-msgstr "Het opgegeven certificaat kon geopend worden!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr "Altijd afwijzen"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr "Afwijzen bij conflicten"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Algemene gebruikersinformatie"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr "Handmatig bij conflicten"
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Proxy account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr "Handmatig"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr ""
-"Filter ongewilde inhoud (bijvoorbeeld pornografische of geweld gerelateerde "
-"inhoud)"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr "Anoniem"
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Beperk proxy gebruik tot werktijd"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr "De waarde opgegeven als Free Busy toekomst dient een integer te zijn"
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Beperk proxy gebruik met quota"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr "De opgegeven waarde voor de Free Busy informatie URL is niet geldig."
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "per"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr "Het uitnodigingsbeleid invoer voor adres '%s' is niet geldig"
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
-msgstr "Intranet account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr "Er is geen E-mail gebruiker met adres '%s' voor uw uitwisselingsbeleid"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -2038,6 +2122,47 @@ msgstr "dagen"
 msgid "Invitation policy"
 msgstr "Uitnodigingsbeleid"
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "WebDAV Account"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Dit account heeft <b>Open-Xchange</b> morgelijkheden uitgeschakeld. Posix "
+"mogelijkheden zijn noodzakelijk voor Open-Xchange accounts. Schakel deze "
+"eerst in."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"Dit account heeft <b>Open-Xchange</b> mogelijkheden uitgeschakeld. E-mail "
+"mogelijkheden zijn noodzakelijk voor Open-Xchange accounts. Schakel deze "
+"eerst in."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+msgid "Couldn't Connect To Postgresql Database"
+msgstr "Kan niet verbinden met de Postgresql Database"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr "Vereiste parameters voor Open-Xchange verbindingsmodule ontbreken!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr "PHP4 module voor Postgresql Database ontbreekt!"
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "FTP account"
@@ -2119,6 +2244,14 @@ msgstr "Gebruikers informatie"
 msgid "User Timezone"
 msgstr "Gebruikers tijdzone"
 
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr "Intranet account"
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "Dit account heeft geen verbindings mogelijkheden."
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2160,139 +2293,62 @@ msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is niet geldig."
 msgid "Intranet"
 msgstr "Intranet"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Lijstnaam"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr "Kolab"
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Naam van de blokkeerlijst"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
-msgstr ""
-"U probeert een ongeldig email adres toe te voegen aan de delegatielijst."
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr ""
-"Het E-mail adres dat u probeert toe te voegen is geen primair E-mail adres "
-"van een bestaande gebruiker."
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
+msgstr "Type"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr "Altijd accepteren"
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr "Altijd afwijzen"
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
+msgstr "Omschrijving"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr "Afwijzen bij conflicten"
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Beschrijving van deze blokkeerlijst"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr "Handmatig bij conflicten"
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Geblokkeerde nummers"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Handmatig"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anoniem"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr "De waarde opgegeven als Free Busy toekomst dient een integer te zijn"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr "De opgegeven waarde voor de Free Busy informatie URL is niet geldig."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr "Het uitnodigingsbeleid invoer voor adres '%s' is niet geldig"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
-msgstr "Er is geen E-mail gebruiker met adres '%s' voor uw uitwisselingsbeleid"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "Ftp"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "De opgegeven waarde voor 'Verstuur Bandbreedte' is niet geldig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "De opgegeven waarde voor 'Ontvangst bandbreedte' is niet geldig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr "De opgegeven waarde voor 'Bestanden' is niet geldig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
-msgstr "De opgegeven waarde voor 'Grootte' is niet geldig."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "De opgegeven waarde voor 'Verhouding' is niet geldig."
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "WebDAV Account"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Dit account heeft <b>Open-Xchange</b> morgelijkheden uitgeschakeld. Posix "
-"mogelijkheden zijn noodzakelijk voor Open-Xchange accounts. Schakel deze "
-"eerst in."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"Dit account heeft <b>Open-Xchange</b> mogelijkheden uitgeschakeld. E-mail "
-"mogelijkheden zijn noodzakelijk voor Open-Xchange accounts. Schakel deze "
-"eerst in."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
-msgstr "Kan niet verbinden met de Postgresql Database"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr "Vereiste parameters voor Open-Xchange verbindingsmodule ontbreken!"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr "PHP4 module voor Postgresql Database ontbreekt!"
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+msgid "Information"
+msgstr "Informatie"
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
-msgstr "Dit account heeft geen verbindings mogelijkheden."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
+msgstr "Nummers kunnen ook wildcards (*?) bevatten."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
@@ -2313,10 +2369,10 @@ msgstr "Geef a.u.b. een geldig telefoonnummer op."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #, fuzzy
@@ -2325,10 +2381,10 @@ msgstr "Naam van de afdeling"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
@@ -2337,10 +2393,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:357
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2349,10 +2405,10 @@ msgstr "Lijst met afdelingen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2361,9 +2417,9 @@ msgstr "Herstarten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2372,10 +2428,10 @@ msgstr "Selecteer om afdelingen te zien"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2394,10 +2450,10 @@ msgstr "Blokkeerlijsten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 #, fuzzy
@@ -2406,10 +2462,10 @@ msgstr "Huidig wachtwoord"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #, fuzzy
@@ -2418,10 +2474,10 @@ msgstr "Toon afdelingen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit"
@@ -2429,10 +2485,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
@@ -2440,7 +2496,7 @@ msgid "edit"
 msgstr "Bewerken"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2448,10 +2504,10 @@ msgstr "Record bewerken"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
@@ -2459,7 +2515,7 @@ msgid "delete"
 msgstr "Verwijderen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2473,10 +2529,10 @@ msgstr "Blokkeerlijst beheer"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/class_systemManagement.inc:578
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Actions"
@@ -2516,63 +2572,6 @@ msgstr "De opgegeven naam wordt al gebruikt."
 msgid "No permission to create a blocklist on this base."
 msgstr "Geen toestemming om een blokkeerlijst aan te maken onder deze basis."
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Lijstnaam"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Naam van de blokkeerlijst"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Selecteer de subtree waaronder de blokkeerlijst geplaatst wordt"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr "Type"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Selecteer of inkomende en uitgaande gesprekken gefilterd moeten worden"
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr "Omschrijving"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Beschrijving van deze blokkeerlijst"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Geblokkeerde nummers"
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-msgid "Information"
-msgstr "Informatie"
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr "Nummers kunnen ook wildcards (*?) bevatten."
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2633,22 +2632,14 @@ msgstr "Selecteer om de ontvangst blokkeerlijsten te zien"
 msgid "Show receive blocklists"
 msgstr "Toon ontvangst blokkeerlijsten"
 
-#: plugins/gofax/blocklists/headpage.tpl:48
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr "Toon overeenkomende blokkeerlijsten"
 
-#: plugins/gofax/blocklists/headpage.tpl:51
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr "Reguliere expressie voor overeenkomende lijstnamen"
 
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr "Toon lijsten die het volgende bevatten"
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr "Toon lijsten die de ingevoerde nummers bevatten"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Blokkeerlijst beheer"
@@ -2753,8 +2744,8 @@ msgid "List of predefined blocklists"
 msgstr "Lijst met voorgedefiniëerde blokkeerlijstn"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -2874,36 +2865,6 @@ msgstr "Overdrachtstijd"
 msgid "# pages"
 msgstr "# pagina's"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Fax rapporten"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Kan niet verbinden met de Fax database. Rapporten kunnen niet getoond worden!"
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr "Kan de Fax database voor rapportage niet selecteren!"
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr "De zoekopdracht op de Fax database is mislukt!"
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr "J-M-D"
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2958,66 +2919,45 @@ msgstr "Ontvanger"
 msgid "Search returned no results..."
 msgstr "De zoekopdracht gaf geen resultaten terug..."
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Fax rapporten"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Bel..."
-
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
-msgid "Dial"
-msgstr "Kies"
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Kan niet verbinden met de Fax database. Rapporten kunnen niet getoond worden!"
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
+msgstr "Kan de Fax database voor rapportage niet selecteren!"
 
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Persoonlijk"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
+msgstr "De zoekopdracht op de Fax database is mislukt!"
 
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Initialen"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
 
-#: plugins/addons/addressbook/address_edit.tpl:40
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
-msgid "Private"
-msgstr "Privé"
-
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "E-mail"
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Bedrijfsmatig"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Bedrijf"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr "J-M-D"
 
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Plaats"
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Fax rapporten"
 
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Land"
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
+msgstr "Privé"
 
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
@@ -3078,6 +3018,57 @@ msgstr "Selecteer het object waarbinnen gezocht zal worden"
 msgid "Search string"
 msgstr "Zoekstring"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Bel..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr "Kies"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Persoonlijk"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Initialen"
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "E-mail"
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Bedrijfsmatig"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Bedrijf"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Plaats"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Land"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3461,6 +3452,55 @@ msgstr "Bericht"
 msgid "System log view"
 msgstr "Systeem log weergave"
 
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr ""
+"Kan de SID van deze groep niet vinden in de LDAP database of in uw "
+"configuratie bestand."
+
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
+msgstr "Deze 'dn' is geen groep."
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
+msgstr "Samba groep"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
+msgstr "Windows beheerders"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
+msgstr "Windows gebruikers"
+
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
+msgstr "Windows gasten"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
+msgstr "Speciale groep (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
+
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
+"liggende streepjes zijn toegestaan."
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr "Primair E-mail adres voor deze gedeelde map"
@@ -3485,6 +3525,24 @@ msgstr "Groepslid rechten"
 msgid "Forward messages to non group members"
 msgstr "Stuur berichten door naar niet groepsleden"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lijst met groepen"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde groepen toe te voegen, bewerken "
+"of verwijderen. Indien u veel groepen heeft, dan is het aan te raden de "
+"selectie mogelijkheden te gebruiken."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Groepen beheer"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3527,7 +3585,7 @@ msgid "Delete this entry"
 msgstr "Verwijder ongebruikte"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -3546,7 +3604,7 @@ msgid "Groupname"
 msgstr "Groepnaam"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:645
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3560,55 +3618,6 @@ msgstr "Eigenschappen"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-"Kan de SID van deze groep niet vinden in de LDAP database of in uw "
-"configuratie bestand."
-
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
-msgstr "Deze 'dn' is geen groep."
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Samba groep"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Windows beheerders"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Windows gebruikers"
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Windows gasten"
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr "Speciale groep (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
-"liggende streepjes zijn toegestaan."
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
-
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -3617,23 +3626,9 @@ msgstr ""
 "Dit kan een primaire groep zijn. Verzeker uzelf ervan dat dit is wat u wilt, "
 "aangezien er geen mogelijkheid voor GOsa is om deze gegevens terug te halen."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Groepen beheer"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lijst met groepen"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde groepen toe te voegen, bewerken "
-"of verwijderen. Indien u veel groepen heeft, dan is het aan te raden de "
-"selectie mogelijkheden te gebruiken."
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Programma opties"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3715,7 +3710,7 @@ msgid "Display users of department"
 msgstr "Toon gebruikers van afdeling"
 
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:48
 msgid "Display users matching"
 msgstr "Toon overeenkomende gebruikers"
 
@@ -3782,10 +3777,6 @@ msgstr "Groepsleden"
 msgid "Folder administrators"
 msgstr "Map beheerders"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Programma opties"
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr "Deze 'dn' bevat geen programma informatie"
@@ -3838,137 +3829,161 @@ msgstr ""
 "veranderingen worden onmiddelijk doorgevoerd. Onthoud het nieuwe wachtwoord "
 "a.u.b. aangezien de gebruiker niet in kan loggen zonder dit wachtwoord."
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
-msgstr "Gebruikers"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Een nieuwe gebruiker aanmaken m.b.v. een sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:239
-#: plugins/admin/users/class_userManagement.inc:290
-msgid "You are not allowed to set this users password!"
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
 msgstr ""
-"U heeft geen toestemming om het wachtwoord van deze gebruiker veranderen!"
-
-#: plugins/admin/users/class_userManagement.inc:326
-#, php-format
-msgid "You're about to delete the user %s."
-msgstr "U staat op het punt gebruiker %s te verwijderen."
+"Het aanmaken van een nieuwe gebruiker kan m.b.v. sjablonen gebeuren. Veel "
+"database records zullen dan automatisch gevuld worden. Kies <b>geen</b> om "
+"het gebruik van sjablonen over te slaan."
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
-msgid "You are not allowed to delete this user!"
-msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:450
-#: plugins/admin/ogroups/class_ogroup.inc:201
-msgid "none"
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Doorgaan"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Gebruikersbeheer"
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+msgstr "Gebruikers"
+
+#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:313
+msgid "You are not allowed to set this users password!"
+msgstr ""
+"U heeft geen toestemming om het wachtwoord van deze gebruiker veranderen!"
+
+#: plugins/admin/users/class_userManagement.inc:349
+#, php-format
+msgid "You're about to delete the user %s."
+msgstr "U staat op het punt gebruiker %s te verwijderen."
+
+#: plugins/admin/users/class_userManagement.inc:355
+#: plugins/admin/users/class_userManagement.inc:383
+msgid "You are not allowed to delete this user!"
+msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
+
+#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:201
+msgid "none"
 msgstr "geen"
 
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Er bestaat al een persoon met deze naam in deze tree."
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "Create new user"
 msgstr "Maak record aan in"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "New user"
 msgstr "gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord"
 
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:672
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:703
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:704
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:708
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:710
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:712
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:714
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:868
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
-msgid "Template"
-msgstr "Sjabloon"
+#: plugins/admin/users/class_userManagement.inc:715
+#, fuzzy
+msgid "Create user from template"
+msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Een nieuwe gebruiker aanmaken m.b.v. een sjabloon"
+#: plugins/admin/users/class_userManagement.inc:716
+#, fuzzy
+msgid "Create user with this template"
+msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-msgstr ""
-"Het aanmaken van een nieuwe gebruiker kan m.b.v. sjablonen gebeuren. Veel "
-"database records zullen dan automatisch gevuld worden. Kies <b>geen</b> om "
-"het gebruik van sjablonen over te slaan."
+#: plugins/admin/users/class_userManagement.inc:771
+#, fuzzy
+msgid "Online"
+msgstr "online"
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Doorgaan"
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Offline"
+msgstr "offline"
 
 #: plugins/admin/users/remove.tpl:7
 msgid ""
@@ -4042,49 +4057,6 @@ msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
 msgid "Show proxy users"
 msgstr "Toon Proxy gebruikers"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Gebruikersbeheer"
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Opties verwijderen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Dit programma heeft opties ingeschakeld. U kunt deze uitschakelen door de "
-"knop hieronder te gebruiken."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Opties aanmaken"
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Dit programma heeft opties uitgeschakeld. U kunt deze inschakelen door de "
-"knop hieronder te gebruiken."
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr "Variabele"
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Standaard waarde"
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Optie toevoegen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Waarde '%s' die opgegeven is als optienaam is niet geldig."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -4143,6 +4115,45 @@ msgstr "Plaats icoon op de desktop van groepsleden"
 msgid "Place entry in members startmenu"
 msgstr "Plaats programma in het startmenu van groepsleden"
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Opties verwijderen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Dit programma heeft opties ingeschakeld. U kunt deze uitschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Opties aanmaken"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Dit programma heeft opties uitgeschakeld. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr "Variabele"
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Standaard waarde"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Optie toevoegen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Waarde '%s' die opgegeven is als optienaam is niet geldig."
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -4180,6 +4191,27 @@ msgstr "Reguliere expressie voor overeenkomende programma namen"
 msgid "Application management"
 msgstr "Programma beheer"
 
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "U staat op het punt de programma '%s' te verwijderen."
+
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
+msgstr "U heeft geen toestemming dit programma te verwijderen"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "new"
+msgstr "Nieuw"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#, fuzzy
+msgid "Create new application"
+msgstr "Programma's aanmaken"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr "Deze 'dn' is geen programma."
@@ -4205,27 +4237,6 @@ msgstr "Vereist veld 'Uitvoeren' is leeg."
 msgid "There's already an application with this 'Name'."
 msgstr "Er is al een programma met deze 'Naam'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "U staat op het punt de programma '%s' te verwijderen."
-
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
-msgid "You are not allowed to delete this application!"
-msgstr "U heeft geen toestemming dit programma te verwijderen"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "new"
-msgstr "Nieuw"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#, fuzzy
-msgid "Create new application"
-msgstr "Programma's aanmaken"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Naam van de afdeling"
@@ -4305,11 +4316,10 @@ msgstr ""
 "de selectie mogelijkheden te gebruiken."
 
 #: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Toon overeenkomende afdelingen"
 
-#: plugins/admin/departments/headpage.tpl:45
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr "Reguliere expressie voor overeenkomende afdelingen"
 
@@ -4317,28 +4327,6 @@ msgstr "Reguliere expressie voor overeenkomende afdelingen"
 msgid "Department management"
 msgstr "Afdeling beheer"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een afdeling aan te maken onder deze 'Basis'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr "Er bestaat al een afdeling met deze 'Naam'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
-msgstr "Vereist veld 'Omschrijving' is leeg."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Het veld 'Naam' bevat het gereserveerde woord 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr "Kies a.u.b. een andere naam."
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4382,6 +4370,28 @@ msgstr "afdelingen"
 msgid ".."
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een afdeling aan te maken onder deze 'Basis'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr "Er bestaat al een afdeling met deze 'Naam'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr "Vereist veld 'Omschrijving' is leeg."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "Het veld 'Naam' bevat het gereserveerde woord 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
+msgstr "Kies a.u.b. een andere naam."
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4432,6 +4442,10 @@ msgstr "IP adres"
 msgid "MAC-address"
 msgstr "Hardware adres (MAC)"
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal server moet een fontpath hebben."
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
@@ -4555,15 +4569,51 @@ msgstr "Audio service"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_terminalService.inc:83
-msgid "default"
-msgstr "standaard"
-
-#: plugins/admin/systems/class_terminalService.inc:84
-msgid "show chooser"
-msgstr "toon keuze-mogelijkheid"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Systeembeheer"
 
-#: plugins/admin/systems/class_terminalService.inc:85
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "NFS Export"
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Tijd Service"
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "LDAP Service"
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Terminal Service"
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Schakel inlog mogelijkheid tijdelijk uit"
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Font path"
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Syslog Service"
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Print Service"
+
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "default"
+msgstr "standaard"
+
+#: plugins/admin/systems/class_terminalService.inc:84
+msgid "show chooser"
+msgstr "toon keuze-mogelijkheid"
+
+#: plugins/admin/systems/class_terminalService.inc:85
 msgid "direct"
 msgstr "direkt"
 
@@ -4593,45 +4643,28 @@ msgstr "Geef a.u.b. een geldig VSync bereik op."
 msgid "Please specify a valid HSync range."
 msgstr "Geef a.u.b. een geldig HSync bereik op."
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Systeembeheer"
-
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr "Terminal server moet een fontpath hebben."
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "NFS Export"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Tijd Service"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "LDAP Service"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Terminal Service"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Schakel inlog mogelijkheid tijdelijk uit"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Font path"
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "De imap verbindings string dient in eruit te zien als '%s'."
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Syslog Service"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "De sieve poort dient nummeriek te zijn."
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Print Service"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "De imap naam dient een hostnaam of een IP adres te zijn."
 
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
@@ -4655,6 +4688,74 @@ msgstr "Actie"
 msgid "Select action to execute for this server"
 msgstr "Selecteer de voor deze server uit te voeren actie"
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Telefoon naam"
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Terminal sjabloon"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Terminal naam"
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr "Modus"
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Selecteer terminal modus"
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Root server"
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Swap server"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Syslog server"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "NTP tijdserver"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Selecteer de voor deze terminal uit te voeren actie"
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4733,10 +4834,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr "Het vereiste veld 'Terminal naam' is leeg."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Telefoon naam"
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Deze 'dn' heeft geen server mogelijkheden."
@@ -4750,70 +4847,6 @@ msgid "You have no permissions to create a server on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een server aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Terminal sjabloon"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Terminal naam"
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr "Modus"
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Selecteer terminal modus"
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Root server"
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Swap server"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Kies het NFS bestandssysteem waarop de swapbestanden geplaatst worden"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Syslog server"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "NTP tijdserver"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Selecteer de voor deze terminal uit te voeren actie"
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Verwijder DHCP service"
@@ -4838,6 +4871,18 @@ msgstr ""
 "Deze server heeft DHCP mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Printernaam"
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "Printer URL"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Directory van PPD"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr "Deze 'dn' heeft geen werkstation mogelijkheden."
@@ -4855,204 +4900,192 @@ msgstr "Het vereiste veld 'Werkstation naam' is leeg."
 msgid "Systems"
 msgstr "Systemen"
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr "U kunt dit object type nog niet bewerken!"
 
-#: plugins/admin/systems/class_systemManagement.inc:339
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr ""
 "Het nieuwe wachtwoord en het herhaalde wachtwoord komen niet met elkaar "
 "overeen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr ""
 "U heeft geen toestemming om het wachtwoord van dit systeem in te stellen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:396
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "U staat op het punt alle informatie over dit component op '%s' te "
 "verwijderen."
 
-#: plugins/admin/systems/class_systemManagement.inc:402
-#: plugins/admin/systems/class_systemManagement.inc:466
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 msgid "You are not allowed to delete this component!"
 msgstr "U heeft geen toestemming om dit component te verwijderen!"
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
 #, fuzzy
 msgid "New Terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
 #, fuzzy
 msgid "New Workstation"
 msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:559
 #, fuzzy
 msgid "New Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:560
 #, fuzzy
 msgid "New Printer"
 msgstr "Printer"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:561
 #, fuzzy
 msgid "New Phone"
 msgstr "Telefoon"
 
-#: plugins/admin/systems/class_systemManagement.inc:563
+#: plugins/admin/systems/class_systemManagement.inc:562
 #, fuzzy
 msgid "New Component"
 msgstr "Ander netwerk component"
 
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-#, fuzzy
-msgid "New system"
-msgstr "Verwijder ongebruikte"
-
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #, fuzzy
 msgid "Edit system"
 msgstr "Lijst van systemen"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #, fuzzy
 msgid "Delete system"
 msgstr "Verwijder ongebruikte"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #, fuzzy
 msgid "System"
 msgstr "Systemen"
 
-#: plugins/admin/systems/class_systemManagement.inc:584
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 #, fuzzy
 msgid "Cups Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Syslog server"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 #, fuzzy
 msgid "Mail Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 #, fuzzy
 msgid "Imap Server"
 msgstr "Swap server"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Asterisk DB gebruiker"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 #, fuzzy
 msgid "Fax Server"
 msgstr "Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Swap server"
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #, fuzzy
 msgid "Set root password"
 msgstr "Wachtwoord instellen"
 
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:700
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminals"
 
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:701
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 #, fuzzy
 msgid "Winstation"
 msgstr "Werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 #, fuzzy
 msgid "Network Device"
 msgstr "Netwerk apparaten"
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
 #: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Printer"
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr "Nieuwe terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr "Nieuw werkstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Terminal sjabloon"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr "Werkstation sjabloon voor"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Printernaam"
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "Printer URL"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Deze 'dn' heeft geen printer mogelijkheden."
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Directory van PPD"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een printer aan te maken onder deze 'Basis'."
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -5076,29 +5109,6 @@ msgstr ""
 "Deze server heeft DNS mogelijkheden uitgeschakeld. U kunt deze inschakelen "
 "door de knop hieronder te gebruiken."
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "De imap verbindings string dient in eruit te zien als '%s'."
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr "De sieve poort dient nummeriek te zijn."
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "De imap naam dient een hostnaam of een IP adres te zijn."
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Werkstation sjabloon"
@@ -5234,15 +5244,6 @@ msgstr "Er zijn geen netwerken met SMTP privileges ingesteld"
 msgid "No SMTP smarthost/relayhost set."
 msgstr "Er is geen SMTP smarthost/relayhost ingesteld"
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Deze 'dn' heeft geen printer mogelijkheden."
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een printer aan te maken onder deze 'Basis'."
-
 #: plugins/admin/systems/servkolab.tpl:14
 msgid "POP3 service"
 msgstr "POP3 service"
@@ -5320,83 +5321,6 @@ msgstr "Accepteer Internet E-mail"
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
-msgstr "Specifieke telefoon instellingen"
-
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
-msgstr "Telefoontype"
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-msgid "Choose a phone type"
-msgstr "Kies een telefoontype"
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr "ververs"
-
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr "DTMF modus"
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr "Standaard IP"
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr "Beantwoord timeout"
-
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr "Modus"
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr "Authorisatietype"
-
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
-msgstr "Wachtwoord"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr "GOFonInKeys"
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
-
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
-msgstr "Account code"
-
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr "Trunk lijnen"
-
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr "Hosts die mogen verbinden"
-
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr "Hosts die niet mogen verbinden"
-
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr "MSN"
-
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
 msgstr "Machine naam"
@@ -5485,28 +5409,19 @@ msgstr "Selecteer om netwerk apparaten te zien"
 msgid "Show network devices"
 msgstr "Toon netwerk apparaten"
 
-#: plugins/admin/systems/headpage.tpl:54
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr "Reguliere expressie voor overeenkomende systeemnamen"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
-msgstr "Toon de terminal(s) van gebruiker"
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Toon adressen van gebruiker"
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr "Gebruikersnaam van wie de terminal(s) getoond worden"
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-msgid "The required field 'MAC-address' is not set."
-msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-msgid "The required field 'IP-address' is not set."
-msgstr "Het vereiste veld 'IP adres' is leeg."
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr "Toetsenbord"
@@ -5688,6 +5603,16 @@ msgid "Changing the password impinges on authentification only."
 msgstr ""
 "Het veranderen van het wachtwoord is alleen van toepassing op authenticatie."
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+msgid "The required field 'MAC-address' is not set."
+msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'IP-address' is not set."
+msgstr "Het vereiste veld 'IP adres' is leeg."
+
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
 msgstr "Apparaat naam"
@@ -5870,52 +5795,121 @@ msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 "U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminals"
-
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-#, fuzzy
-msgid "Phone queue"
-msgstr "Telefoonnummer"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr "Specifieke telefoon instellingen"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "Mail distributielijst"
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
+msgstr "Telefoontype"
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr "Primair E-mail adres voor deze distributielijst"
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+msgid "Choose a phone type"
+msgstr "Kies een telefoontype"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Selecteer de toe te voegen objecten"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
+msgstr "ververs"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Selecteer om afdelingen te zien"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr "DTMF modus"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Toon afdelingen"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr "Standaard IP"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr "Selecteer om GOsa accounts te zien"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr "Beantwoord timeout"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
-msgstr "Toon personen"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr "Modus"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
-msgstr "Selecteer om GOsa groepen te zien"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr "Authorisatietype"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
-msgstr "Toon groepen"
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr "Wachtwoord"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr "GOFonInKeys"
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr "GoFonOutKeys"
+
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr "Account code"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr "Trunk lijnen"
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr "Hosts die mogen verbinden"
+
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr "Hosts die niet mogen verbinden"
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr "MSN"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminals"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#, fuzzy
+msgid "Phone queue"
+msgstr "Telefoonnummer"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Selecteer de toe te voegen objecten"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr "Selecteer om afdelingen te zien"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr "Toon afdelingen"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
+msgstr "Selecteer om GOsa accounts te zien"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Show people"
+msgstr "Toon personen"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see GOsa groups"
+msgstr "Selecteer om GOsa groepen te zien"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Show groups"
+msgstr "Toon groepen"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Select to see applications"
 msgstr "Selecteer om programma's te zien"
 
@@ -5969,57 +5963,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Selecteer de voor deze terminal-groep uit te voeren actie"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Objectgroepen"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "Unix accounts"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr "Servers"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr "Thin Clients"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr "Werkstations"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "U staat op het punt de objectgroep '%s' te verwijderen."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "Create new object group"
-msgstr "Objectgroep"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Naam van de groep"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Objectgroep"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Groep"
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr "Deze 'dn' is geen objectgroep."
@@ -6080,6 +6023,57 @@ msgstr "Objectgroepen hebben ten minste een groepslid nodig!"
 msgid "You can combine two different object types at maximum only!"
 msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Objectgroepen"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr "Unix accounts"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr "Servers"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr "Thin Clients"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr "Werkstations"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "U staat op het punt de objectgroep '%s' te verwijderen."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
+msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "Create new object group"
+msgstr "Objectgroep"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Naam van de groep"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Objectgroep"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Groep"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Naam van de groep"
@@ -6088,20 +6082,6 @@ msgstr "Naam van de groep"
 msgid "Member objects"
 msgstr "Lidmaatschap objecten"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-"Deze groep heeft E-mail mogelijkheden ingeschakeld. U kunt deze uitschakelen "
-"door de knop hieronder te gebruiken."
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"Deze groep heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
-"knop hieronder te gebruiken."
-
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -6152,66 +6132,208 @@ msgstr "Toon groepen die terminals bevatten"
 msgid "Show groups containing printers"
 msgstr "Toon groepen die printers bevatten"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
 msgid "Display object groups matching"
 msgstr "Toon overeenkomende objecten"
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-#, fuzzy
-msgid "Queue Settings"
-msgstr "Quota instellingen"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "Mail distributielijst"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr "Primair E-mail adres voor deze distributielijst"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
+"Deze groep heeft E-mail mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
-#, fuzzy
-msgid "Generic queue Settings"
-msgstr "Algemene gebruikersinformatie"
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"Deze groep heeft geen E-mail mogelijkheden. U kunt deze inschakelen door de "
+"knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
+#: plugins/admin/ogroups/class_phonequeue.inc:83
 #, fuzzy
-msgid "Phone Number"
-msgstr "Telefoonnummer"
+msgid "Remove the phone queue from this Account"
+msgstr "Verwijder telefoon account"
 
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/class_phonequeue.inc:84
 #, fuzzy
-msgid "Down"
-msgstr "Domein"
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr ""
+"Dit account heeft telefoon mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
-msgid "Timeout"
-msgstr "Timeout (s)"
-
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Opnieuw proberen"
+msgid "Create phone queue"
+msgstr "Telefoon account aanmaken"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
-msgid "Strategy"
-msgstr "Provincie"
-
-#: plugins/admin/ogroups/phonequeue.tpl:67
-msgid "Max queue length"
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
+"Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
-msgid "(in seconds)"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
-msgid "Announce holdtime"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+#, fuzzy
+msgid "Yes"
+msgstr "ja"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:136
+msgid "ring all available channels until one answers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:137
+msgid "take turns ringing each available interface"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+msgid "ring interface which was least recently called by this queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+msgid "ring the one with fewest completed calls from this queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+#, fuzzy
+msgid "Timeout must be numeric"
+msgstr "De sieve poort dient nummeriek te zijn."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:181
+msgid "Retry must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:184
+msgid "Max queue length must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:187
+msgid "Announce frequency must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:190
+msgid "There must be least one queue number defined."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "De opgegeven database kon niet geselecteerd worden!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
+#, fuzzy, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr "De opgegeven database kon niet geselecteerd worden!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+#, fuzzy
+msgid "Queue Settings"
+msgstr "Quota instellingen"
+
+#: plugins/admin/ogroups/phonequeue.tpl:6
+msgid "Generic queue setup"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:140
+#, fuzzy
+msgid "Generic queue Settings"
+msgstr "Algemene gebruikersinformatie"
+
+#: plugins/admin/ogroups/phonequeue.tpl:11
+#, fuzzy
+msgid "Phone Number"
+msgstr "Telefoonnummer"
+
+#: plugins/admin/ogroups/phonequeue.tpl:23
+#, fuzzy
+msgid "Down"
+msgstr "Domein"
+
+#: plugins/admin/ogroups/phonequeue.tpl:39
+#, fuzzy
+msgid "Timeout"
+msgstr "Timeout (s)"
+
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Opnieuw proberen"
+
+#: plugins/admin/ogroups/phonequeue.tpl:55
+#, fuzzy
+msgid "Strategy"
+msgstr "Provincie"
+
+#: plugins/admin/ogroups/phonequeue.tpl:67
+msgid "Max queue length"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Announce frequency"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:79
+msgid "(in seconds)"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:84
+msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:98
@@ -6231,218 +6353,249 @@ msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:138
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:135
+#: plugins/admin/ogroups/phonequeue.tpl:143
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
+#: plugins/admin/ogroups/phonequeue.tpl:152
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:160
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "Welkom %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:168
 #, fuzzy
 msgid "Announce message"
 msgstr "Afwezigheidsbericht"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:176
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:184
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:192
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:200
 #, fuzzy
 msgid "'Thank you' message"
 msgstr "Status bericht"
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:208
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:216
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:224
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Telefoon instellingen"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+msgid "no macro"
+msgstr "geen macro"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+msgid "undefined"
+msgstr "niet gedefiniëerd"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
 #, fuzzy
-msgid "Remove the phone queue from this Account"
+msgid "Error while performing query "
+msgstr "Fout bij het exporteren van de gevraagde gegevens!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
+msgstr ""
+"De macro die u in het verleden geselecteerd heeft, is niet meer beschikbaar. "
+"Selecteer a.u.b. een andere macro."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
+msgstr "Dit account heeft geen telefoon mogelijkheden."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
 msgstr "Verwijder telefoon account"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-#, fuzzy
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
 msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 "Dit account heeft telefoon mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid "Create phone queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
 msgstr "Telefoon account aanmaken"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
 #, fuzzy
 msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
 msgstr ""
 "Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
 "inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:131
-msgid "Uruguai"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "No"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-#, fuzzy
-msgid "Yes"
-msgstr "ja"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:133
-msgid "ring all available channels until one answers"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr "Voer a.u.b. een geldig telefoonnummer in!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "ring interface which was least recently called by this queue"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Kies uw privé telefoon"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring the one with fewest completed calls from this queue"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#, php-format
+msgid "You need to specify at least one phone number!"
+msgstr "U dient tenminste één telefoonnummer op te geven!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "ring random interface"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, fuzzy, php-format
+msgid "You need to specify a Phone PIN."
+msgstr "U dient tenminste één telefoonnummer op te geven!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "round robin with memory, remember where we left off last ring pass"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
+"De opgegeven PIN is niet geldig. Alleen cijfers zijn toegestaan voor dit "
+"type."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
-#, fuzzy
-msgid "Timeout must be numeric"
-msgstr "De sieve poort dient nummeriek te zijn."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#, php-format
+msgid "The given PIN is too short"
+msgstr "De opgegeven PIN is te kort"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
+#, php-format
+msgid "The number '%s' is no valid phone number!"
+msgstr "Het nummer '%s' is geen geldig telefoonnummer!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
-msgid "Max queue length must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "De timeout '%s' bevat ongeldige karakters!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
-msgid "Announce frequency must be numeric"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
+"De bevat '%s' bevat ongeldige karakters. '!,#' worden gebruikt als "
+"scheidingstekens"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
-msgid "There must be least one queue number defined."
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-#: plugins/admin/ogroups/class_phonequeue.inc:511
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:922
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:221
-#: plugins/admin/ogroups/class_phonequeue.inc:521
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
-#, fuzzy, php-format
-msgid "Can't select database %s on %s."
-msgstr "De opgegeven database kon niet geselecteerd worden!"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:255
-#: plugins/admin/ogroups/class_phonequeue.inc:410
-#: plugins/admin/ogroups/class_phonequeue.inc:561
-#, fuzzy, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr "De opgegeven database kon niet geselecteerd worden!"
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Telefoonnummers"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:439
-#: plugins/admin/ogroups/class_phonequeue.inc:441
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Stuur oproepen door naar"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
-msgstr "Telefoon macro's"
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Telefoonnummer"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "U staat op het punt de macro '%s' te verwijderen."
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Timeout (s)"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-msgid "You are not allowed to delete this macro!"
-msgstr "U heeft geen toestemming om deze macro te verwijderen!"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
+msgstr "Telefoon macro"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
-msgid "Create new phone macro"
-msgstr "Telefoon account aanmaken"
+msgid "fill out"
+msgstr "Uitloggen"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "Variabele"
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
+msgstr "Telefoon PIN"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Telefoon rapporten"
+
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
+"Kan niet verbinden met de telefoon database. Rapporten kunnen niet getoond "
+"worden!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Macro tekst"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr "Kan de telefoon database voor rapportage niet selecteren!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Publiek zichtbaar"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "De zoekopdracht binnen de telefoon database is mislukt!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Publiek zichtbaar"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Bron"
+
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Doel"
+
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Kanaal"
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Tijdsduur"
+
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Telefoon rapporten"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6523,248 +6676,121 @@ msgstr "Zichtbaar voor gebruikers"
 msgid "Macro text"
 msgstr "Macro tekst"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
-msgstr "Tekstregel"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
-msgstr "Combobox"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
-msgstr "Bool"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
-msgstr "Verwijder ongebruikte"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-"De bevat '%s' bevat ongeldige karakters. '!,#' worden gebruikt als "
-"scheidingstekens"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr "De parameter %s heeft een incorrecte waarde voor het type boolean."
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Lijst met macro's"
-
-#: plugins/gofon/macro/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde macro's toe te voegen, bewerken "
-"of verwijderen. Indien u veel macro's heeft, dan is het aan te raden de "
-"selectie mogelijkheden te gebruiken."
-
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
-msgid "Display macros  matching"
-msgstr "Toon overeenkomende macro's"
-
-#: plugins/gofon/macro/headpage.tpl:44
-msgid "Regular expression for matching macro names"
-msgstr "Reguliere expressie voor overeenkomende macronamen"
-
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
-msgstr "Telefoon macrobeheer"
-
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "type"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
-msgid "no macro"
-msgstr "geen macro"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
-msgid "undefined"
-msgstr "niet gedefiniëerd"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
-#, fuzzy
-msgid "Error while performing query "
-msgstr "Fout bij het exporteren van de gevraagde gegevens!"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:492
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
-msgstr ""
-"De macro die u in het verleden geselecteerd heeft, is niet meer beschikbaar. "
-"Selecteer a.u.b. een andere macro."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
-msgid "This account has no phone extensions."
-msgstr "Dit account heeft geen telefoon mogelijkheden."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
-msgid "Remove phone account"
-msgstr "Verwijder telefoon account"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:576
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Dit account heeft telefoon mogelijkheden ingeschakeld. U kunt deze "
-"uitschakelen door de knop hieronder te gebruiken."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:578
-msgid "Create phone account"
-msgstr "Telefoon account aanmaken"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Lijst met macro's"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
+#: plugins/gofon/macro/headpage.tpl:24
 msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
 msgstr ""
-"Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
-msgid "Please enter a valid phone number!"
-msgstr "Voer a.u.b. een geldig telefoonnummer in!"
+"Dit menu maakt het mogelijk om geselecteerde macro's toe te voegen, bewerken "
+"of verwijderen. Indien u veel macro's heeft, dan is het aan te raden de "
+"selectie mogelijkheden te gebruiken."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-msgid "Choose your private phone"
-msgstr "Kies uw privé telefoon"
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Toon overeenkomende macro's"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
-#, php-format
-msgid "You need to specify at least one phone number!"
-msgstr "U dient tenminste één telefoonnummer op te geven!"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Toon overeenkomende macro's"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
-#, fuzzy, php-format
-msgid "You need to specify a Phone PIN."
-msgstr "U dient tenminste één telefoonnummer op te geven!"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Reguliere expressie voor overeenkomende macronamen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:777
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
-msgstr ""
-"De opgegeven PIN is niet geldig. Alleen cijfers zijn toegestaan voor dit "
-"type."
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+msgstr "Telefoon macrobeheer"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
-#, php-format
-msgid "The given PIN is too short"
-msgstr "De opgegeven PIN is te kort"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
+msgstr "Tekstregel"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:794
-#, php-format
-msgid "The number '%s' is no valid phone number!"
-msgstr "Het nummer '%s' is geen geldig telefoonnummer!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
+msgstr "Combobox"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
-#, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "De timeout '%s' bevat ongeldige karakters!"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr "Bool"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
-msgid "Stop"
-msgstr ""
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
+msgstr "Verwijder ongebruikte"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
+"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Telefoonnummers"
-
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Stuur oproepen door naar"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr "De parameter %s heeft een incorrecte waarde voor het type boolean."
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Telefoonnummer"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
+msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Timeout (s)"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr "Telefoon macro's"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
-msgid "Phone macro"
-msgstr "Telefoon macro"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "U staat op het punt de macro '%s' te verwijderen."
 
-#: plugins/gofon/phoneaccount/generic.tpl:77
-msgid "Phone PIN"
-msgstr "Telefoon PIN"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+msgid "You are not allowed to delete this macro!"
+msgstr "U heeft geen toestemming om deze macro te verwijderen!"
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Telefoon instellingen"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Telefoon account aanmaken"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Telefoon rapporten"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Variabele"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
-"Kan niet verbinden met de telefoon database. Rapporten kunnen niet getoond "
-"worden!"
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr "Kan de telefoon database voor rapportage niet selecteren!"
-
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr "De zoekopdracht binnen de telefoon database is mislukt!"
-
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Bron"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Macro tekst"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Doel"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Publiek zichtbaar"
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Kanaal"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Publiek zichtbaar"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Tijdsduur"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefoon rapporten"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "type"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6811,35 +6837,6 @@ msgstr "Het GOsa team"
 msgid "Welcome %s!"
 msgstr "Welkom %s!"
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-"Kan het opgegeven bestand niet openen. Controleer of het bestand bestaat en "
-"toegankelijk is."
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-"Kan het opgegeven certificaat niet lezen of er is een lege string opgegeven."
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-"Kan het certificaat niet laden. Mogelijk is een niet ondersteund formaat "
-"gebruikt (gebruik PEM/DER)."
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr "Het formaat moet PEM zijn om certificaat informatie te tonen"
-
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr "Kan bestand niet aanmaken/openen"
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr "Geen geldig certificaat geladen"
-
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
@@ -7032,33 +7029,98 @@ msgstr ""
 #: include/class_mail-methods-cyrus.inc:173
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
-"Waarschuwing: De PHP functie 'imap_get_acl' is niet voorhanden. Imap rechten "
-"kunnen niet opgehaald worden!"
+"Waarschuwing: De PHP functie 'imap_get_acl' is niet voorhanden. Imap rechten "
+"kunnen niet opgehaald worden!"
+
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:223
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "Kan het SIEVE script niet ophalen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
+
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+msgstr ""
+"Uw gosa.conf is gedeeltelijk veranderd. Converteer het a.u.b. met het "
+"meegeleverde script fix_config.sh!"
+
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"U bent momenteel database gegevens aan het bewerken. Wilt u eventuele "
+"wijzigingen ongedaan maken?"
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Deze 'dn' heeft geen account extensies."
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Dit is een lege module."
+
+#: include/class_plugin.inc:398
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
+"bestaat niet."
 
-#: include/class_mail-methods-cyrus.inc:195
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
+"bestaat niet."
 
-#: include/class_mail-methods-cyrus.inc:223
+#: include/class_plugin.inc:454
 #, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
+"bestaat niet."
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_config.inc:69
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "Kan het SIEVE script niet ophalen. De server meldt: '%s'."
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "XML fout in gosa.conf: %s op regel %d"
 
-#: include/class_mail-methods-cyrus.inc:307
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
+"systeembeheerder."
 
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
 
 #: include/class_password-methods-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
@@ -7070,14 +7132,6 @@ msgstr ""
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Instellen van het wachtwoord is mislukt. De LDAP server meldt: '%s'."
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:426
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
-"bestaat niet."
-
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -7085,23 +7139,97 @@ msgstr ""
 "De instelling voor 'SMBHASH' in /etc/gosa/gosa.conf is niet correct. Kan het "
 "samba wachtwoord niet veranderen."
 
-#: include/class_pluglist.inc:98
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
-"Uw gosa.conf is gedeeltelijk veranderd. Converteer het a.u.b. met het "
-"meegeleverde script fix_config.sh!"
+"Waarschuwing: Kan het kerberos wachtwoord niet instellen. Uw PHP versie "
+"heeft geen kerberos ondersteuning. Wachtwoord is niet veranderd."
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "De kerberos database communicatie is mislukt!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "Het veranderen van het wachtwoord in de kerberos database is mislukt!"
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+"Kan SHA niet gebruiken voor encryptie. Functie sha1 / mhash / crypt "
+"ontbreekt."
+
+#: include/class_ldap.inc:438
+#, php-format
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
 msgstr ""
-"U bent momenteel database gegevens aan het bewerken. Wilt u eventuele "
-"wijzigingen ongedaan maken?"
+"Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
+"Rapporteer dit a.u.b. aan het GOsa team."
+
+#: include/class_ldap.inc:671
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
+"beginnen met 'dn: ...' op regel %s"
+
+#: include/class_ldap.inc:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
+"vanaf regel %s!"
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+"Kan het opgegeven bestand niet openen. Controleer of het bestand bestaat en "
+"toegankelijk is."
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+"Kan het opgegeven certificaat niet lezen of er is een lege string opgegeven."
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+"Kan het certificaat niet laden. Mogelijk is een niet ondersteund formaat "
+"gebruikt (gebruik PEM/DER)."
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr "Het formaat moet PEM zijn om certificaat informatie te tonen"
+
+#: include/class_certificate.inc:192
+msgid "Can't create/open File"
+msgstr "Kan bestand niet aanmaken/openen"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr "Geen geldig certificaat geladen"
+
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+"%s resultaten voor uw zoekopdracht met sleutelwoord %s geinterpreteerd als %s"
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr "%s%% resultaat in bestand %s"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7524,151 +7652,49 @@ msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
 msgstr ""
-"De aanmelding op de LDAP server is mislukt! Controleer a.u.b. dat deze "
-"bereikbaar is voor GOsa."
-
-#: include/functions_setup.inc:778
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
-msgstr ""
-"Verbinding met de server is succesvol uitgevoerd, maar de server lijkt geen "
-"informatie te bevatten. Controleer alle informatie a.u.b. nogmaals."
-
-#: include/functions_setup.inc:834
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"Het vereiste atribuut '%s' uit dit formulier ontbreekt. Maak a.u.b. uw "
-"invoer af!"
-
-#: include/functions_setup.inc:865
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
-msgstr ""
-"Kan schema informatie niet lezen. GOsa moet uw schema installatie kennen. "
-"Controleer a.u.b. dat deze leesbaar is voor GOsa."
-
-#: include/functions_setup.inc:874
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "De aanmelding op de LDAP server is mislukt. De reden was: '%s'."
-
-#: include/functions_setup.inc:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"Er is geen beheerders account voor GOsa. U zal niets kunnen beheren op dit "
-"moment!"
-
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "XML fout in gosa.conf: %s op regel %d"
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
-"systeembeheerder."
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-"Kan SHA niet gebruiken voor encryptie. Functie sha1 / mhash / crypt "
-"ontbreekt."
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Waarschuwing: Kan het kerberos wachtwoord niet instellen. Uw PHP versie "
-"heeft geen kerberos ondersteuning. Wachtwoord is niet veranderd."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "De kerberos database communicatie is mislukt!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "Het veranderen van het wachtwoord in de kerberos database is mislukt!"
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-"%s resultaten voor uw zoekopdracht met sleutelwoord %s geinterpreteerd als %s"
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr "%s%% resultaat in bestand %s"
-
-#: include/class_ldap.inc:438
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-msgstr ""
-"Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
-"Rapporteer dit a.u.b. aan het GOsa team."
-
-#: include/class_ldap.inc:671
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
-"beginnen met 'dn: ...' op regel %s"
+"De aanmelding op de LDAP server is mislukt! Controleer a.u.b. dat deze "
+"bereikbaar is voor GOsa."
 
-#: include/class_ldap.inc:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "De dn: '%s' (op regel %s) bestaat al in de LDAP database."
+#: include/functions_setup.inc:778
+msgid ""
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all informations twice"
+msgstr ""
+"Verbinding met de server is succesvol uitgevoerd, maar de server lijkt geen "
+"informatie te bevatten. Controleer alle informatie a.u.b. nogmaals."
 
-#: include/class_ldap.inc:700
+#: include/functions_setup.inc:834
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
 msgstr ""
-"Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
-"vanaf regel %s!"
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Deze 'dn' heeft geen account extensies."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Dit is een lege module."
+"Het vereiste atribuut '%s' uit dit formulier ontbreekt. Maak a.u.b. uw "
+"invoer af!"
 
-#: include/class_plugin.inc:398
-#, php-format
+#: include/functions_setup.inc:865
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
 msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
-"bestaat niet."
+"Kan schema informatie niet lezen. GOsa moet uw schema installatie kennen. "
+"Controleer a.u.b. dat deze leesbaar is voor GOsa."
 
-#: include/class_plugin.inc:454
+#: include/functions_setup.inc:874
 #, php-format
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr "De aanmelding op de LDAP server is mislukt. De reden was: '%s'."
+
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
+#: ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
-"Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
-"bestaat niet."
+"Er is geen beheerders account voor GOsa. U zal niets kunnen beheren op dit "
+"moment!"
 
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
@@ -7717,6 +7743,32 @@ msgstr ""
 "toegankelijk! Controleer of deze directory bestaat en wat de rechten op deze "
 "directory zijn!"
 
+#: html/main.php:96
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+"'Register globals' is geactiveerd in PHP. GOsa zal niemand laten inloggen "
+"totdat dit opgelost is door een systeembeheerder."
+
+#: html/main.php:139
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+"Waarschuwing: Geheugengebruik is te hoog - verhoog a.u.b. de 'memory_limit' "
+"in PHP!"
+
+#: html/main.php:263
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr "Kan geen enkele module defenities vinden voor module '%s'!"
+
+#: html/main.php:292
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+"Bij het genereren van deze pagina zijn er fouten geconstateerd bij de W3C "
+"controle!"
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7763,31 +7815,34 @@ msgstr "De sessie zal niet versleuteld zijn."
 msgid "Enter SSL session"
 msgstr "Gebruik een SSL sessie"
 
-#: html/main.php:96
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
-"'Register globals' is geactiveerd in PHP. GOsa zal niemand laten inloggen "
-"totdat dit opgelost is door een systeembeheerder."
+"De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
+"server voor een te grote werkdruk. De eenvoudigste manier om met grote "
+"databases te werken zonder lange timeouts is door zoekopdrachten in grootte "
+"te beperken en door filters te gebruiken voor de informatie die u zoekt."
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-"Waarschuwing: Geheugengebruik is te hoog - verhoog a.u.b. de 'memory_limit' "
-"in PHP!"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Kies a.u.b. de manier waarop gereageerd moet worden voor deze sessie"
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr "Kan geen enkele module defenities vinden voor module '%s'!"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "Negeer deze fout en toon alle gegevens die de LDAP server teruggeeft"
 
-#: html/main.php:292
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
-"Bij het genereren van deze pagina zijn er fouten geconstateerd bij de W3C "
-"controle!"
+"Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
+"grootte limiet en laat me daarvoor in de plaats filters gebruiken"
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -7819,6 +7874,23 @@ msgstr ""
 msgid "Logout"
 msgstr "Uitloggen"
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr "Voer uw <i>gebruikersnaam</i> en <i>wachtwoord</i> in"
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
+msgid "Directory"
+msgstr "Directory"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Klik hier om in te loggen"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7842,70 +7914,6 @@ msgstr ""
 "basis informatie verschaft heeft voor de LDAP verbinding zal de LDAP "
 "installatie gecontroleerd worden."
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "U heeft al een Administratief Account en Groep"
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-"Om volledige administratieve toegang tot GOsa te verkrijgen, dient U een "
-"speciale groep aan te maken die de administratieve gebruiker bevat. Het "
-"installatie programma kan u bij deze taak helpen. Voer hieronder de gewenste "
-"gebruikersnaam en wachtwoord in om de ontbrekende gegevens aan te maken."
-
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr "Voer uw <i>gebruikersnaam</i> en <i>wachtwoord</i> in"
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
-msgid "Directory"
-msgstr "Directory"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Inloggen"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Klik hier om in te loggen"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"De grootte limiet optie maakt LDAP bewerkingen sneller en behoedt de LDAP "
-"server voor een te grote werkdruk. De eenvoudigste manier om met grote "
-"databases te werken zonder lange timeouts is door zoekopdrachten in grootte "
-"te beperken en door filters te gebruiken voor de informatie die u zoekt."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Kies a.u.b. de manier waarop gereageerd moet worden voor deze sessie"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "Negeer deze fout en toon alle gegevens die de LDAP server teruggeeft"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
-"grootte limiet en laat me daarvoor in de plaats filters gebruiken"
-
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7926,20 +7934,6 @@ msgstr "Uitloggen"
 msgid "Signed in:"
 msgstr "Aangemeld:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Er is een blokkade conflict gedetecteerd"
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Indien deze blokkade detectie foutief is dan heeft de andere persoon de "
-"webbrowser afgesloten tijdens de bewerking. U kunt de blokkade in dit geval "
-"verwijderen door de <i>Verwijderen</i> knop te gebruiken."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -7958,6 +7952,38 @@ msgstr ""
 "Stap twee zoekt naar een collectie hulpprogramma's en controleert of deze "
 "programma's de correcte minimum versies hebben."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Er is een blokkade conflict gedetecteerd"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Indien deze blokkade detectie foutief is dan heeft de andere persoon de "
+"webbrowser afgesloten tijdens de bewerking. U kunt de blokkade in dit geval "
+"verwijderen door de <i>Verwijderen</i> knop te gebruiken."
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr "U heeft al een Administratief Account en Groep"
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+"Om volledige administratieve toegang tot GOsa te verkrijgen, dient U een "
+"speciale groep aan te maken die de administratieve gebruiker bevat. Het "
+"installatie programma kan u bij deze taak helpen. Voer hieronder de gewenste "
+"gebruikersnaam en wachtwoord in om de ontbrekende gegevens aan te maken."
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -8196,6 +8222,19 @@ msgstr ""
 "In sommige gevallen kan het handig zijn om foutrapportage aan te zetten "
 "(maar dit kan een veiligheidsrisico vormen) "
 
+#~ msgid "Display lists containing"
+#~ msgstr "Toon lijsten die het volgende bevatten"
+
+#~ msgid "Show lists containing entered numbers"
+#~ msgstr "Toon lijsten die de ingevoerde nummers bevatten"
+
+#, fuzzy
+#~ msgid "New system"
+#~ msgstr "Verwijder ongebruikte"
+
+#~ msgid "Display terminal(s) of user"
+#~ msgstr "Toon de terminal(s) van gebruiker"
+
 #, fuzzy
 #~ msgid "Germany"
 #~ msgstr "Duits"

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index f2ff7947ffb007381965e9468440fa577db4ada0..eb4f43dd92264e12bb076ec7586a21911210069a 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -47,7 +47,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:707
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -56,7 +56,7 @@ msgstr "Почта"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:713
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -71,22 +71,22 @@ msgstr "Подключение"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:711
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Факс"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:709
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -117,7 +117,7 @@ msgstr "Доступ"
 msgid "Options"
 msgstr "Параметры"
 
-#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:507
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:527
 #, fuzzy
 msgid "Parameter"
 msgstr "Параметры загрузки"
@@ -164,7 +164,7 @@ msgstr "Импортировать"
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:131
+#: contrib/gosa.conf:186 plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "German"
 msgstr "Немецкий"
 
@@ -192,13 +192,161 @@ msgstr "Английский"
 msgid "Italian"
 msgstr ""
 
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Что-то будет"
+
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "Метод '%s' не описан в вашем файле конфигурации."
+
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
+
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
+
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "Удалить настройки эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Создать настройки запись эл. почты"
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
+"кому должны пересылаться сообщения."
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Добавление своего единственного адреса к списку пересылки не имеет смысла."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
+"альтернативных адресов."
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr "Добавляемый вами адрес уже используется пользователем"
+
+#: plugins/personal/mail/class_mailAccount.inc:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+msgid "The required field 'Primary address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
+#: plugins/personal/mail/class_mailAccount.inc:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+msgid "Please enter a valid email address in 'Primary address' field."
+msgstr "Введите корректное значение в поле \"Основной адрес\"."
+
+#: plugins/personal/mail/class_mailAccount.inc:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+msgid "The primary address you've entered is already in use."
+msgstr "Введенный вами адрес уже используется."
+
+#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/admin/groups/class_groupMail.inc:625
+msgid "Value in 'Quota size' is not valid."
+msgstr "Значение поля \"Квота\" некорректно."
+
+#: plugins/personal/mail/class_mailAccount.inc:724
+#: plugins/admin/groups/class_groupMail.inc:634
+msgid "Please specify a vaild mail size for mails to be rejected."
+msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
+
+#: plugins/personal/mail/class_mailAccount.inc:734
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
+
+#: plugins/personal/mail/class_mailAccount.inc:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Основной адрес"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:703
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -234,14 +382,14 @@ msgstr "Список альтернативных адресов эл. почт
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -252,14 +400,14 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
 #: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:660
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
 msgid "Add"
 msgstr "Добавить"
@@ -280,13 +428,13 @@ msgstr "Добавить"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:182
-#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
 #: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:21 plugins/gofon/macro/remove.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:21
+#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
 msgid "Delete"
 msgstr "Удалить"
 
@@ -374,213 +522,64 @@ msgstr "Использовать другой сценарий SIEVE"
 msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Что-то будет"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "Метод '%s' не описан в вашем файле конфигурации."
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/users/class_userManagement.inc:610
+#: plugins/admin/applications/class_applicationManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:348
+#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/ogroups/class_ogroupManagement.inc:336
+#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+msgid "Finish"
+msgstr "Готово"
 
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
-
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "В этой учетной записи нет почтовых расширений."
-
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "Удалить настройки эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "Создать настройки запись эл. почты"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
-"кому должны пересылаться сообщения."
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Добавление своего единственного адреса к списку пересылки не имеет смысла."
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
-"альтернативных адресов."
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr "Добавляемый вами адрес уже используется пользователем"
-
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
-#: plugins/personal/mail/class_mailAccount.inc:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-msgid "Please enter a valid email address in 'Primary address' field."
-msgstr "Введите корректное значение в поле \"Основной адрес\"."
-
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-msgid "The primary address you've entered is already in use."
-msgstr "Введенный вами адрес уже используется."
-
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "Значение поля \"Квота\" некорректно."
-
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
-
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
-
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
-
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:587
-#: plugins/admin/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:528
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/phoneaccount/main.inc:104
-msgid "Finish"
-msgstr "Готово"
-
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:51
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:589
-#: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:530
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr "Отмена"
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/samba/samba3_workstations.tpl:41
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:529
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
+msgstr "Отмена"
 
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
 #: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
@@ -632,8 +631,8 @@ msgid "Display addresses of department"
 msgstr "Показать адреса подразделения"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:80
@@ -666,20 +665,20 @@ msgid "User name of which addresses are shown"
 msgstr "Имя пользователя, адрес которого показан"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
 msgid "Password"
 msgstr "Пароль"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -743,8 +742,8 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -767,14 +766,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:256
+#: plugins/admin/users/class_userManagement.inc:260
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:265
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
@@ -794,6 +793,19 @@ msgstr "У вас недостаточно прав для смены своег
 msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Выберите системы для добавления"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Показать системы в подразделении"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Показать подходяшие системы"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Выберите группы для добавления"
@@ -854,22 +866,22 @@ msgid "Display groups of department"
 msgstr "Объединения в подразделении"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:66 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Шаблон для групп"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Регулярное выражение, соответствующее именам групп"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:76
+#: plugins/admin/groups/headpage.tpl:74
 msgid "Display groups of user"
 msgstr "Показать группы пользователей"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:80
+#: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Имя пользователя, для которого перечисляются группы"
 
@@ -882,19 +894,6 @@ msgstr "Пользователь должен сменить пароль при
 msgid "Password expires on"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Выберите системы для добавления"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Показать системы в подразделении"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
-msgid "Display systems matching"
-msgstr "Показать подходяшие системы"
-
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
 #: plugins/personal/samba/class_sambaAccount.inc:626
@@ -955,6 +954,10 @@ msgstr "Язык по умолчанию"
 msgid "System trust"
 msgstr "Системные доверия"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Атрибуты UNIX"
+
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -971,7 +974,7 @@ msgstr "Не настроено"
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:202
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:195
 msgid "automatic"
 msgstr "автоматически"
 
@@ -1261,10 +1264,6 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Атрибуты UNIX"
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Домашний каталог Samba"
@@ -1392,6 +1391,10 @@ msgstr ""
 msgid "Allow connection from these workstations only"
 msgstr "Разрешить подключения только от этой рабочей станции"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Настройки Samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Выберите рабочие станции для добавления"
@@ -1404,10 +1407,6 @@ msgstr "Показать рабочие станции подразделени
 msgid "Display workstations matching"
 msgstr "Показать соответствующие рабочие станции"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Настройки Samba"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "В этой учетной записи нет расширений Samba."
@@ -1512,46 +1511,184 @@ msgstr ""
 "Предупреждение: не удается идентифицировать основную группу, преобразование "
 "в группу Samba невозможно!"
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"Вы изменили метод шифрования паролей в базе LDAP. В связи с этим введите "
-"свой пароль снова. GOsa произведет шифрование в соответствии с выбраной "
-"схемой."
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "женский"
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Изображение"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "мужской"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "УдалиÑ\82Ñ\8c изобÑ\80ажение"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Ð\94лÑ\8f Ñ\8dÑ\82ой Ñ\83Ñ\87еÑ\82ной запиÑ\81и неÑ\82 коÑ\80Ñ\80екÑ\82нÑ\8bÑ\85 Ñ\80аÑ\81Ñ\88иÑ\80ений GOsa."
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Сохранить"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
+"прервана."
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Ð\9bиÑ\87наÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f"
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
-msgstr "Сменить изображение"
+#: plugins/personal/generic/class_user.inc:404
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
-msgid "Name"
-msgstr "Фамилия"
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:408
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Изменить сертификаты"
+
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr "Ошибка соединения с базой данных Kerberos"
+
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr "Не удается удалить пользователя из базы данных Kerberos."
+
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr "Не удается добавить пользователя в базу данных Kerberos."
+
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/personal/generic/class_user.inc:881
+#, fuzzy
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#: plugins/personal/generic/class_user.inc:887
+#: plugins/addons/addressbook/class_addressbook.inc:527
+#: plugins/admin/users/class_userManagement.inc:528
+msgid "The required field 'Name' is not set."
+msgstr "Обязательное поле \"Имя\" не заполнено."
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr ""
+"Пользователь с таким регистрационным именем в базе данных уже существует."
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/addons/addressbook/class_addressbook.inc:531
+#: plugins/admin/users/class_userManagement.inc:531
+msgid "The required field 'Given name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Пользователь с такой комбинацией имени и личного имени в базе данных уже "
+"существует."
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
+"Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
+
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:953
+#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/admin/departments/class_departmentGeneric.inc:159
+msgid "The field 'Name' contains invalid characters."
+msgstr "Значение поля \"Имя\" содержит недопустимые символы."
+
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:950
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:562
+msgid "The field 'Given name' contains invalid characters."
+msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
+
+#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/addons/addressbook/class_addressbook.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
+
+#: plugins/personal/generic/class_user.inc:939
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:165
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
+
+#: plugins/personal/generic/class_user.inc:1070
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Вы изменили метод шифрования паролей в базе LDAP. В связи с этим введите "
+"свой пароль снова. GOsa произведет шифрование в соответствии с выбраной "
+"схемой."
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Личная информация"
+
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Изображение"
+
+#: plugins/personal/generic/generic.tpl:17
+msgid "Change picture"
+msgstr "Сменить изображение"
+
+#: plugins/personal/generic/generic.tpl:24
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
+msgid "Name"
+msgstr "Фамилия"
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:22
@@ -1657,9 +1794,9 @@ msgstr "Организация"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1685,8 +1822,8 @@ msgid "Room No."
 msgstr "Номер комнаты"
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Мобильный"
@@ -1763,6 +1900,15 @@ msgstr "Последняя доставка"
 msgid "Public visible"
 msgstr "Видимый всем"
 
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Удалить изображение"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Сохранить"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Стандартный сертификат"
@@ -1773,7 +1919,7 @@ msgstr "Стандартный сертификат"
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:712
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Удалить"
@@ -1790,187 +1936,128 @@ msgstr "Сертификат PKCS12"
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr "женÑ\81кий"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "Ð\92ам не Ñ\80азÑ\80еÑ\88ено менÑ\8fÑ\82Ñ\8c паÑ\80олÑ\8c."
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr "мÑ\83жÑ\81кой"
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Ð\9eбÑ\89аÑ\8f инÑ\84оÑ\80маÑ\86иÑ\8f о полÑ\8cзоваÑ\82еле"
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr "Для этой учетной записи нет корректных расширений GOsa."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
-msgstr ""
-"Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
-"прервана."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr "Ð\92ведиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81еÑ\80ийнÑ\8bй номеÑ\80"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "Ð\97наÑ\87ение полÑ\8f \"Ð\9fÑ\80опÑ\83Ñ\81кнаÑ\8f Ñ\81поÑ\81обноÑ\81Ñ\82Ñ\8c (Ñ\81 Ñ\81еÑ\80веÑ\80а)\" некоÑ\80Ñ\80екÑ\82но."
 
-#: plugins/personal/generic/class_user.inc:404
-#, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "Значение поля \"Размер\" некорректно."
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr ""
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "Значение поля \"Отношение\" некорректно."
 
-#: plugins/personal/generic/class_user.inc:408
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Изменить сертификаты"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr "Ð\9eÑ\88ибка Ñ\81оединениÑ\8f Ñ\81 базой даннÑ\8bÑ\85 Kerberos"
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Ð\90ккаÑ\83нÑ\82 Proxy"
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr "Не удается удалить пользователя из базы данных Kerberos."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
+msgstr ""
+"Фильтровать нежелательное содержимое (например, порнографическое или "
+"связанное с насилием)"
 
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr "Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f добавиÑ\82Ñ\8c полÑ\8cзоваÑ\82елÑ\8f в базÑ\83 даннÑ\8bÑ\85 Kerberos."
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Ð\9eгÑ\80аниÑ\87иÑ\82Ñ\8c доÑ\81Ñ\82Ñ\83п к пÑ\80окÑ\81и Ñ\80абоÑ\87им вÑ\80еменем"
 
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f полÑ\8cзоваÑ\82елÑ\8f в Ñ\8dÑ\82ой веÑ\82ке."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Ð\9eгÑ\80аниÑ\87иÑ\82Ñ\8c квоÑ\82ой иÑ\81полÑ\8cзование пÑ\80окÑ\81и"
 
-#: plugins/personal/generic/class_user.inc:881
-#, fuzzy
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "per"
 
-#: plugins/personal/generic/class_user.inc:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:505
-msgid "The required field 'Name' is not set."
-msgstr "Обязательное поле \"Имя\" не заполнено."
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
 msgstr ""
-"Пользователь с таким регистрационным именем в базе данных уже существует."
-
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:508
-msgid "The required field 'Given name' is not set."
-msgstr "Обязательное поле \"Личное имя\" не заполнено."
-
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
-msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/connectivity/class_kolabAccount.inc:102
+#, fuzzy
 msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
+"You're trying to add an invalid email address to the list of delegations."
 msgstr ""
-"Ð\9fолÑ\8cзоваÑ\82елÑ\8c Ñ\81 Ñ\82акой комбинаÑ\86ией имени и лиÑ\87ного имени в базе даннÑ\8bÑ\85 Ñ\83же "
-"существует."
+"Ð\92Ñ\8b пÑ\8bÑ\82аеÑ\82еÑ\81Ñ\8c добавиÑ\82Ñ\8c некоÑ\80Ñ\80екÑ\82нÑ\8bй адÑ\80еÑ\81 Ñ\8dлекÑ\82Ñ\80онной поÑ\87Ñ\82Ñ\8b к Ñ\81пиÑ\81кÑ\83 Ñ\82еÑ\85, "
+"кому должны пересылаться сообщения."
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/connectivity/class_kolabAccount.inc:110
+#, fuzzy
 msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
-"Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
-
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
-
-#: plugins/personal/generic/class_user.inc:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-msgid "The field 'Name' contains invalid characters."
-msgstr "Значение поля \"Имя\" содержит недопустимые символы."
-
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
-msgid "The field 'Given name' contains invalid characters."
-msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
-
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Phone' contains an invalid phone number."
-msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
-
-#: plugins/personal/generic/class_user.inc:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:165
-msgid "The field 'Fax' contains an invalid phone number."
-msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
+"The mail address you're trying to add is no primary mail address of an "
+"existing user."
+msgstr "Добавляемый вами адрес уже используется пользователем"
 
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1070
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
 #, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "Невозможно выбрать базу данных!"
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "Вам не разрешено менять пароль."
+msgid "Reject if conflicts"
+msgstr "В"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Общая информация о пользователе"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Аккаунт Proxy"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#, fuzzy
+msgid "Manual"
+msgstr "Январь"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
 msgstr ""
-"Фильтровать нежелательное содержимое (например, порнографическое или "
-"связанное с насилием)"
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Ограничить доступ к прокси рабочим временем"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr ""
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Ограничить квотой использование прокси"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+#, fuzzy
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr "Значение поля \"Файлы\" некорректно."
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "per"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-#, fuzzy
-msgid "Intranet account"
-msgstr "Создать телефонный аккаунт"
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#, php-format
+msgid "There's no mail user with address '%s' for your invitation policy!"
+msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
@@ -2029,6 +2116,49 @@ msgstr "день"
 msgid "Invitation policy"
 msgstr ""
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Учетная запись WebDAV"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Posix features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
+"атрибуты POSIX, включите сначала их использование."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> features disabled. Mail features are "
+"needed for openXchange accounts, enable them first."
+msgstr ""
+"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
+"атрибуты POSIX, включите сначала их использование."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
+#, fuzzy
+msgid "Couldn't Connect To Postgresql Database"
+msgstr "Невозможно подключиться к серверу базы данных!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
+#, fuzzy
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr "Невозможно выполнить запрос к базе данных журналов!"
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "Аккаунт FTP"
@@ -2113,6 +2243,15 @@ msgstr "Информация"
 msgid "User Timezone"
 msgstr ""
 
+#: plugins/personal/connectivity/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "В этой учетной записи нет атрибутов для подключения."
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -2155,145 +2294,62 @@ msgstr "Значение поля \"Квота\" некорректно."
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Список"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-#, fuzzy
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
-msgstr ""
-"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
-"кому должны пересылаться сообщения."
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Имя стоп-листа"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
-#, fuzzy
-msgid ""
-"The mail address you're trying to add is no primary mail address of an "
-"existing user."
-msgstr "Добавляемый вами адрес уже используется пользователем"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Выберите ветку стоп-листа"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/php_setup.inc:122
+msgid "Type"
+msgstr "Тип"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-#, fuzzy
-msgid "Reject if conflicts"
-msgstr "В"
+#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/admin/applications/generic.tpl:24
+#: plugins/admin/departments/generic.tpl:12
+#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/systems/printer.tpl:10
+#: plugins/admin/systems/wingeneric.tpl:24
+#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
+#: plugins/generic/references/contents.tpl:11
+msgid "Description"
+msgstr "Описание"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Описание стоп-листа"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-#, fuzzy
-msgid "Manual"
-msgstr "Январь"
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-#, fuzzy
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr "Значение поля \"Файлы\" некорректно."
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "Значение поля \"Пропускная способность (на сервер)\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "Значение поля \"Пропускная способность (с сервера)\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr "Значение поля \"Файлы\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
-msgstr "Значение поля \"Размер\" некорректно."
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "Значение поля \"Отношение\" некорректно."
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Учетная запись WebDAV"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-#, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
-"атрибуты POSIX, включите сначала их использование."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
-#, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
-msgstr ""
-"В этой учетной записи нет настроек Samba. Для учетных записей Samba нужны "
-"атрибуты POSIX, включите сначала их использование."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-#, fuzzy
-msgid "Couldn't Connect To Postgresql Database"
-msgstr "Невозможно подключиться к серверу базы данных!"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Блокируемые номера"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-#, fuzzy
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr "Невозможно выполнить запрос к базе данных журналов!"
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/addons/addressbook/contents.tpl:33
+#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
+#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
+#: plugins/gofon/macro/headpage.tpl:20
+msgid "Information"
+msgstr "Информация"
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
-msgstr "В этой учетной записи нет атрибутов для подключения."
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
+msgstr "Вместо точных номеров можно использовать шаблоны."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
@@ -2314,10 +2370,10 @@ msgstr "Укажите корректный номер телефона."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #, fuzzy
@@ -2326,10 +2382,10 @@ msgstr "Подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/admin/users/class_userManagement.inc:647
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:22
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
@@ -2338,10 +2394,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:357
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2350,10 +2406,10 @@ msgstr "Список подразделений"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:554
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #, fuzzy
@@ -2362,9 +2418,9 @@ msgstr "Перезагрузить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2373,10 +2429,10 @@ msgstr "Выберите подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:556
+#: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #, fuzzy
@@ -2395,10 +2451,10 @@ msgstr "\"Черные списки\""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/class_userManagement.inc:654
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 #, fuzzy
@@ -2407,10 +2463,10 @@ msgstr "Текущий пароль"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #, fuzzy
@@ -2419,10 +2475,10 @@ msgstr "Показать подразделения"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:568
+#: plugins/admin/systems/class_systemManagement.inc:565
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 msgid "Submit"
@@ -2430,10 +2486,10 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
@@ -2441,7 +2497,7 @@ msgid "edit"
 msgstr "Изменить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:635
+#: plugins/admin/users/class_userManagement.inc:658
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2449,10 +2505,10 @@ msgstr "Пользователи домена"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
@@ -2460,7 +2516,7 @@ msgid "delete"
 msgstr "Удалить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:637
+#: plugins/admin/users/class_userManagement.inc:660
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2474,10 +2530,10 @@ msgstr "Управление \"черными списками\""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:581
+#: plugins/admin/systems/class_systemManagement.inc:578
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 msgid "Actions"
@@ -2516,63 +2572,6 @@ msgstr "Указанное имя уже используется."
 msgid "No permission to create a blocklist on this base."
 msgstr "Недостаточно прав для создания стоп-листа в этой ветке."
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Список"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Имя стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Выберите ветку стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
-msgstr "Тип"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Выберите, нужно ли фильтровать входящие или исходящие звонки"
-
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
-#: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:10
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:36
-#: plugins/generic/references/contents.tpl:11
-msgid "Description"
-msgstr "Описание"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Описание стоп-листа"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Блокируемые номера"
-
-#: plugins/gofax/blocklists/generic.tpl:67
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20 plugins/admin/ogroups/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-msgid "Information"
-msgstr "Информация"
-
-#: plugins/gofax/blocklists/generic.tpl:69
-msgid "Numbers can also contain wild cards."
-msgstr "Вместо точных номеров можно использовать шаблоны."
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
@@ -2634,22 +2633,14 @@ msgstr "Выберите, чтобы просмотреть стоп-листы
 msgid "Show receive blocklists"
 msgstr "Показать стоп-листы получения"
 
-#: plugins/gofax/blocklists/headpage.tpl:48
+#: plugins/gofax/blocklists/headpage.tpl:45
 msgid "Display lists matching"
 msgstr "Шаблон для стоп-листов"
 
-#: plugins/gofax/blocklists/headpage.tpl:51
+#: plugins/gofax/blocklists/headpage.tpl:48
 msgid "Regular expression for matching list names"
 msgstr "Регулярное выражение, соответствующее именам списков"
 
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr "Шаблон для содержимого стоп-листов"
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr "Показать \"черные списки\", содержащие введенные номера"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Управление \"черными списками\""
@@ -2756,8 +2747,8 @@ msgid "List of predefined blocklists"
 msgstr "Готовые \"черные списки\""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
+#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
 msgid "Apply"
 msgstr "Применить"
 
@@ -2876,36 +2867,6 @@ msgstr "Время передачи"
 msgid "# pages"
 msgstr "Число страниц"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Отчеты о факсах"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
-
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
-
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr "Невозможно выполнить запрос к базе данных факсов!"
-
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr "У вас недостаточно прав для получения информации об этом факсе!"
-
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr "Г-М-Д"
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2960,67 +2921,46 @@ msgstr "Получатель"
 msgid "Search returned no results..."
 msgstr "Не найдено..."
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
 msgstr "Отчеты о факсах"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Соединение..."
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
-msgid "Dial"
-msgstr "Звонок"
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
+msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Выбрать раздел, для хранения объекта"
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
+msgstr "Невозможно выполнить запрос к базе данных факсов!"
 
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Контакт"
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr "У вас недостаточно прав для получения информации об этом факсе!"
 
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Отчество"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr "Г-М-Д"
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Отчеты о факсах"
 
-#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Личный"
 
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Email"
-
-#: plugins/addons/addressbook/address_edit.tpl:64
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "Организация"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Компания"
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Город"
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Страна"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Контакт"
@@ -3080,6 +3020,57 @@ msgstr "Выберите объект, в котором будет осущес
 msgid "Search string"
 msgstr "Строка поиска"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Соединение..."
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:359
+#: plugins/addons/addressbook/class_addressbook.inc:366
+#: plugins/addons/addressbook/class_addressbook.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:454
+msgid "Dial"
+msgstr "Звонок"
+
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Выбрать раздел, для хранения объекта"
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Контакт"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Отчество"
+
+#: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "Email"
+
+#: plugins/addons/addressbook/address_edit.tpl:64
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "Организация"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Компания"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Город"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Страна"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3467,6 +3458,53 @@ msgstr "Сообщение"
 msgid "System log view"
 msgstr "Просмотр системного журнала"
 
+#: plugins/admin/groups/class_groupGeneric.inc:109
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
+
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
+msgstr "Это DN соответствует не группе."
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
+msgstr "Группа Samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
+msgstr "Администраторы домена"
+
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
+msgstr "Пользователи домена"
+
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
+msgstr "Непривилегированные пользователи домена"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
+msgstr "Специальная группа (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/ogroups/class_ogroup.inc:492
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "У вас недостаточно прав для создания группы в этой ветке."
+
+#: plugins/admin/groups/class_groupGeneric.inc:591
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
+"буквы в нижнем регистре, цифры и дефисы."
+
+#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/admin/groups/class_groupGeneric.inc:609
+msgid "Value specified as 'Name' is already used."
+msgstr "Группа с таким именем уже существует."
+
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
 msgstr "Основной адрес эл. почты для этой общей папки"
@@ -3491,6 +3529,25 @@ msgstr "Права для членов группы"
 msgid "Forward messages to non group members"
 msgstr "Пересылать сообщения не членам группы"
 
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Список групп"
+
+#: plugins/admin/groups/headpage.tpl:25
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Управление группами"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3533,7 +3590,7 @@ msgid "Delete this entry"
 msgstr "Удалить"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Posix"
 msgstr "Прокси-сервер"
@@ -3552,7 +3609,7 @@ msgid "Groupname"
 msgstr "Группа"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:645
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3566,53 +3623,6 @@ msgstr "Свойства"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
-
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
-msgstr "Это DN соответствует не группе."
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Группа Samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Администраторы домена"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Пользователи домена"
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Непривилегированные пользователи домена"
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr "Специальная группа (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "У вас недостаточно прав для создания группы в этой ветке."
-
-#: plugins/admin/groups/class_groupGeneric.inc:591
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
-"буквы в нижнем регистре, цифры и дефисы."
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr "Группа с таким именем уже существует."
-
 #: plugins/admin/groups/remove.tpl:7
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
@@ -3622,24 +3632,9 @@ msgstr ""
 "действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
 "этой операции."
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Управление группами"
-
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Список групп"
-
-#: plugins/admin/groups/headpage.tpl:25
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Параметры приложения"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3720,7 +3715,7 @@ msgid "Display users of department"
 msgstr "Подразделение"
 
 #: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
+#: plugins/admin/users/headpage.tpl:48
 msgid "Display users matching"
 msgstr "Фильтр"
 
@@ -3787,10 +3782,6 @@ msgstr "Члены группы"
 msgid "Folder administrators"
 msgstr "Администраторы папки"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Параметры приложения"
-
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr "Это DN соответствует не группе приложений."
@@ -3844,136 +3835,160 @@ msgstr ""
 "вступят в силу немедленно. Пожалуйста, запомните новый пароль, так как иначе "
 "пользователь не сможет войти в систему."
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
-msgstr "Пользователи"
-
-#: plugins/admin/users/class_userManagement.inc:239
-#: plugins/admin/users/class_userManagement.inc:290
-msgid "You are not allowed to set this users password!"
-msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Создание пользователя на основе шаблона"
 
-#: plugins/admin/users/class_userManagement.inc:326
-#, php-format
-msgid "You're about to delete the user %s."
-msgstr "Вы собираетесь удалить пользователя %s."
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
+"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
+"использовать шаблоны."
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
-msgid "You are not allowed to delete this user!"
-msgstr "У вас недостаточно прав для удаления этого пользователя!"
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:450
-#: plugins/admin/ogroups/class_ogroup.inc:201
-msgid "none"
-msgstr "нет"
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Продолжить"
+
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Управление пользователями"
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+msgstr "Пользователи"
+
+#: plugins/admin/users/class_userManagement.inc:243
+#: plugins/admin/users/class_userManagement.inc:313
+msgid "You are not allowed to set this users password!"
+msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
+
+#: plugins/admin/users/class_userManagement.inc:349
+#, php-format
+msgid "You're about to delete the user %s."
+msgstr "Вы собираетесь удалить пользователя %s."
+
+#: plugins/admin/users/class_userManagement.inc:355
+#: plugins/admin/users/class_userManagement.inc:383
+msgid "You are not allowed to delete this user!"
+msgstr "У вас недостаточно прав для удаления этого пользователя!"
+
+#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/ogroups/class_ogroup.inc:201
+msgid "none"
+msgstr "нет"
 
-#: plugins/admin/users/class_userManagement.inc:517
+#: plugins/admin/users/class_userManagement.inc:540
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "Create new user"
 msgstr "Создание нового объекта в"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 #, fuzzy
 msgid "New user"
 msgstr "пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 #, fuzzy
 msgid "password"
 msgstr "Пароль"
 
-#: plugins/admin/users/class_userManagement.inc:644
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:672
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:703
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_userManagement.inc:704
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:708
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:710
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:712
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:714
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:868
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
-msgid "Template"
-msgstr "Шаблон"
+#: plugins/admin/users/class_userManagement.inc:715
+#, fuzzy
+msgid "Create user from template"
+msgstr "Создать шаблон"
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Создание пользователя на основе шаблона"
+#: plugins/admin/users/class_userManagement.inc:716
+#, fuzzy
+msgid "Create user with this template"
+msgstr "Создать шаблон"
 
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-msgstr ""
-"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
-"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
-"использовать шаблоны."
+#: plugins/admin/users/class_userManagement.inc:771
+#, fuzzy
+msgid "Online"
+msgstr "в сети"
 
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Продолжить"
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Offline"
+msgstr "не в сети"
 
 #: plugins/admin/users/remove.tpl:7
 msgid ""
@@ -4051,49 +4066,6 @@ msgstr "Выберите, чтобы просмотреть пользовате
 msgid "Show proxy users"
 msgstr "Показать пользователей с прокси-серверами"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Управление пользователями"
-
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Удалить параметры"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Для этого приложения указаны параметры. Вы можете отключить их "
-"использование, щелкнув ниже."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Создать параметры"
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Для этого приложения отключено использование параметров. Вы можете включить "
-"его, щелкнув ниже."
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr "Переменная"
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "По умолчанию"
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Добавить параметр"
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 #: plugins/admin/applications/class_applicationManagement.inc:354
@@ -4154,6 +4126,45 @@ msgstr "Помещать пиктограмму на рабочие столы 
 msgid "Place entry in members startmenu"
 msgstr "Помещать членам группы соответствующий элемент в меню запуска"
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Удалить параметры"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Для этого приложения указаны параметры. Вы можете отключить их "
+"использование, щелкнув ниже."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Создать параметры"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Для этого приложения отключено использование параметров. Вы можете включить "
+"его, щелкнув ниже."
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr "Переменная"
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "По умолчанию"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Добавить параметр"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Значение \"%s\", указанное как имя параметра, некорректно."
+
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -4192,6 +4203,27 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Application management"
 msgstr "Управление приложениями"
 
+#: plugins/admin/applications/class_applicationManagement.inc:247
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Вы собираетесь удалить приложение \"%s\"."
+
+#: plugins/admin/applications/class_applicationManagement.inc:253
+#: plugins/admin/applications/class_applicationManagement.inc:279
+msgid "You are not allowed to delete this application!"
+msgstr "У вас недостаточно прав для удаления этого приложения!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "new"
+msgstr "Создать"
+
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#, fuzzy
+msgid "Create new application"
+msgstr "Создать приложения"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
 msgstr "Это DN соответствует не приложению."
@@ -4216,27 +4248,6 @@ msgstr "Обязательное поле \"Выполнить\" не запол
 msgid "There's already an application with this 'Name'."
 msgstr "Приложение с таким именем уже существует."
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Вы собираетесь удалить приложение \"%s\"."
-
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
-msgid "You are not allowed to delete this application!"
-msgstr "У вас недостаточно прав для удаления этого приложения!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "new"
-msgstr "Создать"
-
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#, fuzzy
-msgid "Create new application"
-msgstr "Создать приложения"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Подразделение"
@@ -4317,11 +4328,10 @@ msgstr ""
 "можете использовать групповое выделение."
 
 #: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
 msgid "Display departments matching"
 msgstr "Шаблон для подразделений"
 
-#: plugins/admin/departments/headpage.tpl:45
+#: plugins/admin/departments/headpage.tpl:42
 msgid "Regular expression for matching department names"
 msgstr "Регулярное выражение, соответствующее именам подразделений"
 
@@ -4329,27 +4339,6 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Department management"
 msgstr "Управление подразделениями"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:133
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-#: plugins/admin/departments/class_departmentGeneric.inc:142
-msgid "Department with that 'Name' already exists."
-msgstr "Подразделение с таким именем уже существует."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:150
-msgid "Required field 'Description' is not set."
-msgstr "Обязательное поле \"Описание\" не заполнено."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr " Введите другое имя."
-
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
 #: plugins/admin/ogroups/class_ogroupManagement.inc:389
@@ -4393,6 +4382,27 @@ msgstr "подразделения"
 msgid ".."
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:142
+msgid "Department with that 'Name' already exists."
+msgstr "Подразделение с таким именем уже существует."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr "Обязательное поле \"Описание\" не заполнено."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:156
+msgid " Please choose another name."
+msgstr " Введите другое имя."
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4441,6 +4451,10 @@ msgstr "IP-адрес"
 msgid "MAC-address"
 msgstr "MAC-адрес"
 
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 #, fuzzy
@@ -4567,13 +4581,57 @@ msgstr "Звук"
 msgid "GUI"
 msgstr "Графический интерфейс"
 
-#: plugins/admin/systems/class_terminalService.inc:83
-msgid "default"
-msgstr "по Ñ\83молÑ\87аниÑ\8e"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
 
-#: plugins/admin/systems/class_terminalService.inc:84
-msgid "show chooser"
-msgstr "показать окно входа в систему"
+#: plugins/admin/systems/servservice.tpl:11
+#, fuzzy
+msgid "Nfs Export"
+msgstr "Экспорт"
+
+#: plugins/admin/systems/servservice.tpl:37
+#, fuzzy
+msgid "Time Service"
+msgstr "Сервисы"
+
+#: plugins/admin/systems/servservice.tpl:61
+#, fuzzy
+msgid "LDAP Service"
+msgstr "LDAP-сервер"
+
+#: plugins/admin/systems/servservice.tpl:72
+#, fuzzy
+msgid "Terminal Service"
+msgstr "Терминальный сервер"
+
+#: plugins/admin/systems/servservice.tpl:77
+#, fuzzy
+msgid "Temporary disable login"
+msgstr "Временно отключить использование факса"
+
+#: plugins/admin/systems/servservice.tpl:80
+#, fuzzy
+msgid "Font path"
+msgstr "Контакт"
+
+#: plugins/admin/systems/servservice.tpl:93
+#, fuzzy
+msgid "Syslog Service"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/servservice.tpl:101
+#, fuzzy
+msgid "Print Service"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "default"
+msgstr "по умолчанию"
+
+#: plugins/admin/systems/class_terminalService.inc:84
+msgid "show chooser"
+msgstr "показать окно входа в систему"
 
 #: plugins/admin/systems/class_terminalService.inc:85
 msgid "direct"
@@ -4606,53 +4664,28 @@ msgstr "Пожалуйста, укажите корректную кадрову
 msgid "Please specify a valid HSync range."
 msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Управление системами"
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, fuzzy, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:11
-#, fuzzy
-msgid "Nfs Export"
-msgstr "Экспорт"
-
-#: plugins/admin/systems/servservice.tpl:37
-#, fuzzy
-msgid "Time Service"
-msgstr "Сервисы"
-
-#: plugins/admin/systems/servservice.tpl:61
-#, fuzzy
-msgid "LDAP Service"
-msgstr "LDAP-сервер"
-
-#: plugins/admin/systems/servservice.tpl:72
-#, fuzzy
-msgid "Terminal Service"
-msgstr "Терминальный сервер"
-
-#: plugins/admin/systems/servservice.tpl:77
-#, fuzzy
-msgid "Temporary disable login"
-msgstr "Временно отключить использование факса"
-
-#: plugins/admin/systems/servservice.tpl:80
-#, fuzzy
-msgid "Font path"
-msgstr "Контакт"
-
-#: plugins/admin/systems/servservice.tpl:93
-#, fuzzy
-msgid "Syslog Service"
-msgstr "Сервер системных журналов"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-#, fuzzy
-msgid "Print Service"
-msgstr "Служба печати"
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
 
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
@@ -4677,6 +4710,74 @@ msgstr "Действие"
 msgid "Select action to execute for this server"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Название"
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Терминал"
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr "Режим"
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Выберите режим терминала"
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Основной сервер"
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Выберите корневую файловую систему NFS"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Выберите файловую систему NFS для файлов подкачки"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Выберите сервер для ведения системных журналов"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "Сервер NTP"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr "Выберите сервер для синхронизации времени"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
+
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4753,10 +4854,6 @@ msgstr "У вас недостаточно прав для создания те
 msgid "The required field 'Terminal name' is not set."
 msgstr "Обязательное поле 'Название терминала' не заполнено."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Название"
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 #, fuzzy
 msgid "This 'dn' has no server features."
@@ -4772,70 +4869,6 @@ msgstr "Обязательное поле \"Личное имя\" не запо
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Шаблон терминала"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Терминал"
-
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr "Режим"
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Выберите режим терминала"
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Основной сервер"
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr "Выберите корневую файловую систему NFS"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Сервер подкачки"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Выберите файловую систему NFS для файлов подкачки"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Сервер системных журналов"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Выберите сервер для ведения системных журналов"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Сервер NTP"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr "Выберите сервер для синхронизации времени"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Выберите действие, которое нужно выполнить на этом терминале"
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Удалить сервис DHCP"
@@ -4862,6 +4895,18 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Имя принтера"
+
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "URL принтера"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Путь к PPD"
+
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr "Это DN не содержит атрибутоов рабочей станции."
@@ -4878,200 +4923,187 @@ msgstr "Обязательное поле 'Название рабочей ст
 msgid "Systems"
 msgstr "Системы"
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr "Вы не можете редактировать сейчас этот тип объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:339
+#: plugins/admin/systems/class_systemManagement.inc:338
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "Введенные пароли не совпадают!"
 
-#: plugins/admin/systems/class_systemManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:351
 msgid "You are not allowed to set this systems password!"
 msgstr "У вас недостаточно прав для смены пароля этой системы!"
 
-#: plugins/admin/systems/class_systemManagement.inc:396
+#: plugins/admin/systems/class_systemManagement.inc:395
 #, fuzzy, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
 
-#: plugins/admin/systems/class_systemManagement.inc:402
-#: plugins/admin/systems/class_systemManagement.inc:466
+#: plugins/admin/systems/class_systemManagement.inc:401
+#: plugins/admin/systems/class_systemManagement.inc:465
 #, fuzzy
 msgid "You are not allowed to delete this component!"
 msgstr "У вас недостаточно прав для удаления этого объекта!"
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:557
+#: plugins/admin/systems/class_systemManagement.inc:704
 #, fuzzy
 msgid "New Terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:558
+#: plugins/admin/systems/class_systemManagement.inc:705
 #, fuzzy
 msgid "New Workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:559
 #, fuzzy
 msgid "New Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:560
 #, fuzzy
 msgid "New Printer"
 msgstr "Принтер"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:561
 #, fuzzy
 msgid "New Phone"
 msgstr "Телефон"
 
-#: plugins/admin/systems/class_systemManagement.inc:563
+#: plugins/admin/systems/class_systemManagement.inc:562
 #, fuzzy
 msgid "New Component"
 msgstr "Прочие сетевые компоненты"
 
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr ""
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-#, fuzzy
-msgid "New system"
-msgstr "Удалить"
-
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 #, fuzzy
 msgid "Edit system"
 msgstr "Список систем"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 #, fuzzy
 msgid "Delete system"
 msgstr "Удалить"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 #, fuzzy
 msgid "System"
 msgstr "Системы"
 
-#: plugins/admin/systems/class_systemManagement.inc:584
+#: plugins/admin/systems/class_systemManagement.inc:581
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 #, fuzzy
 msgid "Cups Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Сервер системных журналов"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 #, fuzzy
 msgid "Mail Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 #, fuzzy
 msgid "Imap Server"
 msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 #, fuzzy
 msgid "Fax Server"
 msgstr "Сервер"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Сервер подкачки"
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 #, fuzzy
 msgid "Set root password"
 msgstr "Изменить пароль"
 
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:700
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
 
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:701
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 #, fuzzy
 msgid "Winstation"
 msgstr "Рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 #, fuzzy
 msgid "Network Device"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/systems/class_systemManagement.inc:708
 #: plugins/admin/ogroups/class_ogroupManagement.inc:49
 #: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Принтер"
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr "Создать терминал"
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr "Новая рабочая станция"
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr "Шаблон рабочей станции для"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Имя принтера"
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "URL принтера"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Этот DN не имеет свойств принтера."
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Ð\9fÑ\83Ñ\82Ñ\8c к PPD"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f пÑ\80инÑ\82еÑ\80а в Ñ\8dÑ\82ой веÑ\82ке."
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -5097,29 +5129,6 @@ msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, fuzzy, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "Неправильное указание таймаута '%s'"
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Шаблон рабочей станции"
@@ -5263,14 +5272,6 @@ msgstr ""
 msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Этот DN не имеет свойств принтера."
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "У вас недостаточно прав для создания принтера в этой ветке."
-
 #: plugins/admin/systems/servkolab.tpl:14
 #, fuzzy
 msgid "POP3 service"
@@ -5354,93 +5355,6 @@ msgstr ""
 msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-#, fuzzy
-msgid "Specific Phone settings"
-msgstr "Настройки телефона"
-
-#: plugins/admin/systems/phonesettings.tpl:9
-#, fuzzy
-msgid "Phone type"
-msgstr "Название"
-
-#: plugins/admin/systems/phonesettings.tpl:10
-#: plugins/admin/systems/phonesettings.tpl:28
-#: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:52
-#: plugins/admin/systems/phonesettings.tpl:83
-#: plugins/admin/systems/phonesettings.tpl:114
-#: plugins/admin/systems/phonesettings.tpl:161
-#, fuzzy
-msgid "Choose a phone type"
-msgstr "Выберите тип мыши"
-
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:35
-#, fuzzy
-msgid "DTMF mode"
-msgstr "Режим"
-
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-#, fuzzy
-msgid "Default IP"
-msgstr "по умолчанию"
-
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:80
-#, fuzzy
-msgid "Modus"
-msgstr "Мышь"
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:121
-#, fuzzy
-msgid "Secret"
-msgstr "Улица"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:150
-#, fuzzy
-msgid "Account code"
-msgstr "Учетная запись"
-
-#: plugins/admin/systems/phonesettings.tpl:158
-#, fuzzy
-msgid "Trunk lines"
-msgstr "Тонкие клиенты"
-
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr ""
-
-#: plugins/admin/systems/phonesettings.tpl:188
-#, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
-
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
-
 #: plugins/admin/systems/wingeneric.tpl:6
 #, fuzzy
 msgid "Machine name"
@@ -5535,30 +5449,19 @@ msgstr "Выберите чтобы посмотреть сетевые прин
 msgid "Show network devices"
 msgstr "Сетевые устройства"
 
-#: plugins/admin/systems/headpage.tpl:54
+#: plugins/admin/systems/headpage.tpl:52
 msgid "Regular expression for matching system names"
 msgstr "Регулярное выражение, соответствующее именам систем"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
-msgstr "Показать терминал(ы) пользователя"
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Показать адреса пользователя"
 
-#: plugins/admin/systems/headpage.tpl:65
+#: plugins/admin/systems/headpage.tpl:62
 msgid "User name of which terminal(s) are shown"
 msgstr "Имя пользователя, для которого перечисляются терминалы"
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-#, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr "Обязательное поле \"Основной адрес\" не заполнено."
-
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr "Клавиатура"
@@ -5739,6 +5642,18 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Изменение пароля влияет только на аутентификацию в системе."
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr "Обязательное поле \"Основной адрес\" не заполнено."
+
 #: plugins/admin/systems/component.tpl:6
 #, fuzzy
 msgid "Device name"
@@ -5926,37 +5841,115 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Терминалы"
+#: plugins/admin/systems/phonesettings.tpl:1
+#, fuzzy
+msgid "Specific Phone settings"
+msgstr "Настройки телефона"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#: plugins/admin/systems/phonesettings.tpl:9
 #, fuzzy
-msgid "Phone queue"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+msgid "Phone type"
+msgstr "Ð\9dазвание"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+#, fuzzy
+msgid "Choose a phone type"
+msgstr "Выберите тип мыши"
+
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
+#: plugins/admin/systems/phonesettings.tpl:35
 #, fuzzy
-msgid "Primary mail address for this distribution list"
-msgstr "Основной адрес эл. почты для этой общей папки"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Выбрать объекты для добавления"
+msgid "DTMF mode"
+msgstr "Режим"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Выберите подразделение"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+#, fuzzy
+msgid "Default IP"
+msgstr "по умолчанию"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Показать подразделения"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:80
+#, fuzzy
+msgid "Modus"
+msgstr "Мышь"
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+#, fuzzy
+msgid "Secret"
+msgstr "Улица"
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+#, fuzzy
+msgid "Account code"
+msgstr "Учетная запись"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+#, fuzzy
+msgid "Trunk lines"
+msgstr "Тонкие клиенты"
+
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:188
+#, fuzzy
+msgid "Hosts that are not allowed to connect"
+msgstr "У вас недостаточно прав для удаления этого объекта!"
+
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Терминалы"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#, fuzzy
+msgid "Phone queue"
+msgstr "Номер телефона"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Выбрать объекты для добавления"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr "Выберите подразделение"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr "Показать подразделения"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Select to see GOsa accounts"
 msgstr "Выберите чтобы посмотреть пользователей GOsa"
 
@@ -6024,57 +6017,6 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-msgid "Object groups"
-msgstr "Объединения"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "UNIX аккаунт"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr "Серверы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr "Тонкие клиенты"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr "Рабочие станции"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Вы собираетесь удалить групповой объект \"%s\"."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
-msgid "You are not allowed to delete this object group!"
-msgstr "У вас недостаточно прав для удаления этого группового объекта!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#, fuzzy
-msgid "Create new object group"
-msgstr "Объект группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Название группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Объект группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Группа"
-
 #: plugins/admin/ogroups/class_ogroup.inc:95
 msgid "This 'dn' is no object group."
 msgstr "Этот объект не является группой."
@@ -6136,6 +6078,57 @@ msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Вы можете комбинировать не более двух различных классов в одном объекте!"
 
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+msgid "Object groups"
+msgstr "Объединения"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr "UNIX аккаунт"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr "Серверы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr "Тонкие клиенты"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr "Рабочие станции"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Вы собираетесь удалить групповой объект \"%s\"."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+msgid "You are not allowed to delete this object group!"
+msgstr "У вас недостаточно прав для удаления этого группового объекта!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "Create new object group"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Название группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/generic/references/class_reference.inc:36
+msgid "Group"
+msgstr "Группа"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Название группы"
@@ -6144,22 +6137,6 @@ msgstr "Название группы"
 msgid "Member objects"
 msgstr "Включаемые объекты"
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-#, fuzzy
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-#, fuzzy
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
-"щелкнув ниже."
-
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -6211,62 +6188,206 @@ msgstr "Показать группы с терминалами"
 msgid "Show groups containing printers"
 msgstr "Показать группы с принтерами"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
 msgid "Display object groups matching"
 msgstr "Показать совпадения объектов"
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-#, fuzzy
-msgid "Queue Settings"
-msgstr "Настройки Samba"
-
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
+#: plugins/admin/ogroups/mail.tpl:11
 #, fuzzy
-msgid "Generic queue Settings"
-msgstr "Общая информация о пользователе"
+msgid "Primary mail address for this distribution list"
+msgstr "Основной адрес эл. почты для этой общей папки"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 #, fuzzy
-msgid "Phone Number"
-msgstr "Номер телефона"
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
 
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 #, fuzzy
-msgid "Down"
-msgstr "Домен"
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"В этой учетной записи нет настроек электронной почты. Вы можете добавить их, "
+"щелкнув ниже."
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/class_phonequeue.inc:83
 #, fuzzy
-msgid "Timeout"
-msgstr "ТаймаÑ\83Ñ\82 (Ñ\81)"
+msgid "Remove the phone queue from this Account"
+msgstr "УдалиÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Повторить"
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+#, fuzzy
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
+msgstr ""
+"В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
+"щелкнув ниже."
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
-msgid "Strategy"
-msgstr "Ð\90дм. единиÑ\86а"
+msgid "Create phone queue"
+msgstr "СоздаÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
-msgid "Max queue length"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid ""
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
+"В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
+"щелкнув ниже."
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
-msgid "Announce frequency"
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
-msgid "(in seconds)"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+#, fuzzy
+msgid "Yes"
+msgstr "Системы"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:136
+msgid "ring all available channels until one answers"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:137
+msgid "take turns ringing each available interface"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+msgid "ring interface which was least recently called by this queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+msgid "ring the one with fewest completed calls from this queue"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+msgid "Timeout must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:181
+msgid "Retry must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:184
+msgid "Max queue length must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:187
+msgid "Announce frequency must be numeric"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:190
+msgid "There must be least one queue number defined."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
+#, fuzzy, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:475
+#: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+#, fuzzy
+msgid "Queue Settings"
+msgstr "Настройки Samba"
+
+#: plugins/admin/ogroups/phonequeue.tpl:6
+msgid "Generic queue setup"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:140
+#, fuzzy
+msgid "Generic queue Settings"
+msgstr "Общая информация о пользователе"
+
+#: plugins/admin/ogroups/phonequeue.tpl:11
+#, fuzzy
+msgid "Phone Number"
+msgstr "Номер телефона"
+
+#: plugins/admin/ogroups/phonequeue.tpl:23
+#, fuzzy
+msgid "Down"
+msgstr "Домен"
+
+#: plugins/admin/ogroups/phonequeue.tpl:39
+#, fuzzy
+msgid "Timeout"
+msgstr "Таймаут (с)"
+
+#: plugins/admin/ogroups/phonequeue.tpl:47
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Повторить"
+
+#: plugins/admin/ogroups/phonequeue.tpl:55
+#, fuzzy
+msgid "Strategy"
+msgstr "Адм. единица"
+
+#: plugins/admin/ogroups/phonequeue.tpl:67
+msgid "Max queue length"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Announce frequency"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:79
+msgid "(in seconds)"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:84
@@ -6290,219 +6411,244 @@ msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:138
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:135
+#: plugins/admin/ogroups/phonequeue.tpl:143
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
+#: plugins/admin/ogroups/phonequeue.tpl:152
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:160
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "Добро пожаловать %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:168
 #, fuzzy
 msgid "Announce message"
 msgstr "Сообщение автоответчика"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:176
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:184
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:192
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:200
 #, fuzzy
 msgid "'Thank you' message"
 msgstr "Сообщение о состоянии"
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:208
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:216
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:224
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Настройки телефона"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "УдалиÑ\82Ñ\8c Ñ\82елеÑ\84оннÑ\8bй аккаÑ\83нÑ\82"
+msgid "no macro"
+msgstr "ТелеÑ\84оннÑ\8bе оÑ\82Ñ\87еÑ\82Ñ\8b"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
 #, fuzzy
+msgid "undefined"
+msgstr "не определена"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
+msgid "Error while performing query "
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
 msgid ""
-"Phone queue is enabled for this group. You can disable it by clicking below."
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
+msgstr "В этой учетной записи нет атрибутов для телефона."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 "В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
 "щелкнув ниже."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid "Create phone queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
 #, fuzzy
 msgid ""
-"For this group the phone queues are disabled. You can enable them by "
-"clicking below."
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
 msgstr ""
 "В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
 "щелкнув ниже."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:131
-msgid "Uruguai"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
+"щелкнув ниже."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-msgid "No"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr "Введите корректный номер телефона!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
-#, fuzzy
-msgid "Yes"
-msgstr "Системы"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Укажите личный телефон"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:133
-msgid "ring all available channels until one answers"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#, php-format
+msgid "You need to specify at least one phone number!"
+msgstr "Необходимо указать не менее одного телефонного номера!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, fuzzy, php-format
+msgid "You need to specify a Phone PIN."
+msgstr "Необходимо указать не менее одного телефонного номера!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "ring interface which was least recently called by this queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring the one with fewest completed calls from this queue"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#, php-format
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "ring random interface"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
+#, php-format
+msgid "The number '%s' is no valid phone number!"
+msgstr "Неправильный номер телефона '%s'"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "round robin with memory, remember where we left off last ring pass"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
-msgid "Timeout must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#, fuzzy, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+msgstr "Неправильное указание таймаута '%s'"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
-msgid "Retry must be numeric"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
-msgid "Max queue length must be numeric"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Телефонные номера"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
-msgid "There must be least one queue number defined."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Перенаправлять звонки на"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
-#: plugins/admin/ogroups/class_phonequeue.inc:511
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:922
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Номер телефона"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:221
-#: plugins/admin/ogroups/class_phonequeue.inc:521
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
-#, fuzzy, php-format
-msgid "Can't select database %s on %s."
-msgstr "Невозможно выбрать базу данных!"
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Таймаут (с)"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:255
-#: plugins/admin/ogroups/class_phonequeue.inc:410
-#: plugins/admin/ogroups/class_phonequeue.inc:561
-#, fuzzy, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr "Невозможно выбрать базу данных!"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+#, fuzzy
+msgid "Phone macro"
+msgstr "Телефонные отчеты"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:439
-#: plugins/admin/ogroups/class_phonequeue.inc:441
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1028
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
+#: plugins/gofon/phoneaccount/generic.tpl:67
+#, fuzzy
+msgid "fill out"
+msgstr "Выход"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#: plugins/gofon/phoneaccount/generic.tpl:78
 #, fuzzy
-msgid "Phone macros"
+msgid "Phone PIN"
+msgstr "Телефон"
+
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, fuzzy, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Вы собираетесь удалить группу \"%s\"."
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr "Не удается подключиться к телефонной базе, отчеты показаны не будут!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-#, fuzzy
-msgid "You are not allowed to delete this macro!"
-msgstr "У вас недостаточно прав для удаления этой группы!"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr "Не могу выбрать базу телефонов для создания отчета!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Создать телефонный аккаунт"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "Запрос в базу телефонов не выполнен!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "Переменная"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Источник"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Назначение"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Название"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Канал"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Видимый всем"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Продолжительность"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Видимый всем"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Телефонные отчеты"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6588,47 +6734,6 @@ msgstr "Список пользователей"
 msgid "Macro text"
 msgstr "Название"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-#, fuzzy
-msgid "String"
-msgstr "в течение"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-#, fuzzy
-msgid "Delete unused"
-msgstr "Удалить"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
-#, fuzzy, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr "Неправильное указание таймаута '%s'"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
-#, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
 #: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
 msgid "List of macros"
@@ -6645,12 +6750,17 @@ msgstr ""
 "группы пользователей. Если у вас их достаточно большое количество, вы можете "
 "использовать групповое выделение."
 
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Шаблон для групп"
+
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
 msgid "Display macros  matching"
 msgstr "Шаблон для групп"
 
-#: plugins/gofon/macro/headpage.tpl:44
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
 msgid "Regular expression for matching macro names"
 msgstr "Регулярное выражение, соответствующее именам групп"
@@ -6660,179 +6770,95 @@ msgstr "Регулярное выражение, соответствующее
 msgid "Phone macro management"
 msgstr "Управление системами"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "подразделения"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Тип"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
-#, fuzzy
-msgid "no macro"
-msgstr "Телефонные отчеты"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 #, fuzzy
-msgid "undefined"
-msgstr "не определена"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
-msgid "Error while performing query "
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:492
-msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
-msgid "This account has no phone extensions."
-msgstr "В этой учетной записи нет атрибутов для телефона."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
-msgid "Remove phone account"
-msgstr "Удалить телефонный аккаунт"
+msgid "String"
+msgstr "в течение"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:576
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
 msgstr ""
-"В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
-"щелкнув ниже."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:578
-msgid "Create phone account"
-msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
 msgstr ""
-"В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
-"щелкнув ниже."
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
-msgid "Please enter a valid phone number!"
-msgstr "Введите корректный номер телефона!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
-msgid "Choose your private phone"
-msgstr "Укажите личный телефон"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
-#, php-format
-msgid "You need to specify at least one phone number!"
-msgstr "Необходимо указать не менее одного телефонного номера!"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
-#, fuzzy, php-format
-msgid "You need to specify a Phone PIN."
-msgstr "Необходимо указать не менее одного телефонного номера!"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:777
-#, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
-msgstr ""
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#, fuzzy
+msgid "Delete unused"
+msgstr "Удалить"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
 #, php-format
-msgid "The given PIN is too short"
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:794
-#, php-format
-msgid "The number '%s' is no valid phone number!"
-msgstr "Неправильный номер телефона '%s'"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "Неправильное указание таймаута '%s'"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
-msgid "Stop"
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:995
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Телефонные номера"
-
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Перенаправлять звонки на"
-
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Номер телефона"
-
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Таймаут (с)"
-
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "Phone macro"
+msgid "Phone macros"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/phoneaccount/generic.tpl:77
-#, fuzzy
-msgid "Phone PIN"
-msgstr "Телефон"
-
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Настройки телефона"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, fuzzy, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Телефонные отчеты"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#, fuzzy
+msgid "You are not allowed to delete this macro!"
+msgstr "У вас недостаточно прав для удаления этой группы!"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr "Не удается подключиться к телефонной базе, отчеты показаны не будут!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr "Не могу выбрать базу телефонов для создания отчета!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Переменная"
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr "Запрос в базу телефонов не выполнен!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Источник"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Название"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Назначение"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Видимый всем"
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Канал"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Видимый всем"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Продолжительность"
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "подразделения"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Телефонные отчеты"
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Тип"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6876,33 +6902,8 @@ msgstr "Команда разработчиков GOsa"
 
 #: plugins/generic/welcome/main.inc:24
 #, php-format
-msgid "Welcome %s!"
-msgstr "Добро пожаловать %s!"
-
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
-msgstr ""
-
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
-msgstr ""
-
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
-msgstr ""
-
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
-msgstr ""
-
-#: include/class_certificate.inc:192
-#, fuzzy
-msgid "Can't create/open File"
-msgstr "Невозможно импортиовать пустой файл"
-
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr ""
+msgid "Welcome %s!"
+msgstr "Добро пожаловать %s!"
 
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
@@ -7125,44 +7126,162 @@ msgstr "Невозможно отправить сценарий SIEVE. Отве
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
+"Ваш конфигурационный файл gosa.conf был частично изменен. Пожалуйста, "
+"сконвертиуйте его используя скрипт fix_config.sh"
 
-#: include/class_password-methods.inc:165
+#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"Вы сейчас редактируете объект базы данных. Хотите отказаться от изменений?"
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Для этого DN нет расширений учетной записи."
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Это пустой модуль."
+
+#: include/class_plugin.inc:398
 #, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr "Ошибка при установке пароля. Ответ LDAP-сервера: \"%s\"."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:426
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "Ошибка XML в gosa.conf: %s в строке %d"
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
+"администратору."
+
+#: include/class_config.inc:433
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr "Ошибка при установке пароля. Ответ LDAP-сервера: \"%s\"."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
 "Параметр SMBHASH в gosa.conf некорректен! Не удается сменить пароль Samba."
 
-#: include/class_pluglist.inc:98
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
-"Ð\92аÑ\88 конÑ\84игÑ\83Ñ\80аÑ\86ионнÑ\8bй Ñ\84айл gosa.conf бÑ\8bл Ñ\87аÑ\81Ñ\82иÑ\87но изменен. Ð\9fожалÑ\83йÑ\81Ñ\82а, "
-"сконвертиуйте его используя скрипт fix_config.sh"
+"Ð\9fÑ\80едÑ\83пÑ\80еждение: не Ñ\83даеÑ\82Ñ\81Ñ\8f Ñ\81оздаÑ\82Ñ\8c паÑ\80олÑ\8c Kerberos. Ð\92 ваÑ\88ей Ñ\83Ñ\81Ñ\82ановке PHP "
+"нет поддержки Kerberos, пароль не был изменен."
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "Ошибка подключения к базе данных Kerberos!"
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr "Ошибка смены пароля в базе данных Kerberos!"
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_ldap.inc:438
+#, php-format
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
+"об этом команде разработчиков GOsa."
+
+#: include/class_ldap.inc:671
+#, 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:684
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:700
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+#, fuzzy
+msgid "Can't create/open File"
+msgstr "Невозможно импортиовать пустой файл"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:335
+#, php-format
+msgid "%s%% hit rate in file %s"
 msgstr ""
-"Вы сейчас редактируете объект базы данных. Хотите отказаться от изменений?"
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7545,157 +7664,64 @@ msgid ""
 "escape all quotes in strings in this case."
 msgstr ""
 
-#: include/functions_setup.inc:666
-msgid "You've to specify an ldap server before continuing!"
-msgstr "Для продолжения укажите LDAP-сервер!"
-
-#: include/functions_setup.inc:675 include/functions_setup.inc:758
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
-msgstr ""
-"Не удается подключиться к указанному LDAP-серверу! Убедитесь, что он "
-"доступен GOsa."
-
-#: include/functions_setup.inc:689 include/functions_setup.inc:763
-#: include/functions_setup.inc:768
-#, fuzzy
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
-msgstr ""
-"Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
-"доступен GOsa."
-
-#: include/functions_setup.inc:778
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
-msgstr ""
-
-#: include/functions_setup.inc:834
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
-"целиком."
-
-#: include/functions_setup.inc:865
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
-msgstr ""
-
-#: include/functions_setup.inc:874
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
-
-#: include/functions_setup.inc:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
-"либо администрировать!"
-
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Ошибка XML в gosa.conf: %s в строке %d"
-
-#: include/class_config.inc:195 html/index.php:140
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
-"администратору."
-
-#: include/class_config.inc:433
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Предупреждение: не удается создать пароль Kerberos. В вашей установке PHP "
-"нет поддержки Kerberos, пароль не был изменен."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "Ошибка подключения к базе данных Kerberos!"
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "Ошибка смены пароля в базе данных Kerberos!"
-
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
-#: include/class_ldap.inc:438
-#, php-format
+#: include/functions_setup.inc:666
+msgid "You've to specify an ldap server before continuing!"
+msgstr "Для продолжения укажите LDAP-сервер!"
+
+#: include/functions_setup.inc:675 include/functions_setup.inc:758
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"Can't connect to the specified LDAP server! Please make sure that is "
+"reachable for GOsa."
 msgstr ""
-"Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81кое Ñ\81оздание Ñ\82ипа \"%s\" не поддеÑ\80живаеÑ\82Ñ\81Ñ\8f. Ð\9fожалÑ\83йÑ\81Ñ\82а, Ñ\81ообÑ\89иÑ\82е "
-"об Ñ\8dÑ\82ом команде Ñ\80азÑ\80абоÑ\82Ñ\87иков GOsa."
+"Ð\9dе Ñ\83даеÑ\82Ñ\81Ñ\8f подклÑ\8eÑ\87иÑ\82Ñ\8cÑ\81Ñ\8f к Ñ\83казанномÑ\83 LDAP-Ñ\81еÑ\80веÑ\80Ñ\83! УбедиÑ\82еÑ\81Ñ\8c, Ñ\87Ñ\82о он "
+"доÑ\81Ñ\82Ñ\83пен GOsa."
 
-#: include/class_ldap.inc:671
-#, php-format
+#: include/functions_setup.inc:689 include/functions_setup.inc:763
+#: include/functions_setup.inc:768
+#, fuzzy
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Can't bind to the specified LDAP server! Please make sure that it is "
+"reachable for GOsa."
 msgstr ""
+"Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
+"доступен GOsa."
 
-#: include/class_ldap.inc:684
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+#: include/functions_setup.inc:778
+msgid ""
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all informations twice"
 msgstr ""
 
-#: include/class_ldap.inc:700
+#: include/functions_setup.inc:834
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
 msgstr ""
+"Вы не заполнили обязательное поле \"%s\". Пожалуйста, заполните форму "
+"целиком."
 
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Для этого DN нет расширений учетной записи."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Это пустой модуль."
-
-#: include/class_plugin.inc:398
-#, php-format
+#: include/functions_setup.inc:865
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
 msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:454
+#: include/functions_setup.inc:874
 #, php-format
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
+
+#: include/functions_setup.inc:984 include/functions_setup.inc:1007
+#: include/functions_setup.inc:1016 html/index.php:176
+#: ihtml/themes/altlinux/setup_useradmin.tpl:6
+#: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
+"либо администрировать!"
 
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
@@ -7741,6 +7767,28 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
+#: html/main.php:96
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+"Используется механизм register_globals. GOsa не допустит пользователей в "
+"систему, пока он не будет отключен администратором."
+
+#: html/main.php:139
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr "Предупреждение: нехватка памяти, увеличьте значение memory_limit!"
+
+#: html/main.php:263
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr "Не удается найти определение для модуля \"%s\"!"
+
+#: html/main.php:292
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7783,27 +7831,36 @@ msgstr "Данные, передаваемые в течение этого се
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
-#: html/main.php:96
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
 msgstr ""
-"Используется механизм register_globals. GOsa не допустит пользователей в "
-"систему, пока он не будет отключен администратором."
+"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
+"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
+"снизить время обработки запроса при обслуживаии большой базы данных это "
+"установить минимальное значение. Кроме того, будет очень полезно "
+"использовать фильтры для просмотра только ограниченного количества объектов."
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr "Ð\9fÑ\80едÑ\83пÑ\80еждение: неÑ\85ваÑ\82ка памÑ\8fÑ\82и, Ñ\83велиÑ\87Ñ\8cÑ\82е знаÑ\87ение memory_limit!"
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е Ñ\82ип Ñ\80еакÑ\86ии длÑ\8f данной Ñ\81еÑ\81Ñ\81ии"
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr "Не удается найти определение для модуля \"%s\"!"
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr "игнорировать ошибку и показать все найденые объекты"
 
-#: html/main.php:292
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+#, fuzzy
 msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
+"Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
+"позволить использовать фильтры"
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -7834,41 +7891,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Выход"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr "Добро пожаловать в раздел настройки GOsa!"
-
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
-msgstr ""
-"Судя по всему, вы запустили GOsa впервые: файл настройки не найден. Этот "
-"сценарий поможет вам создать рабочую конфигурацию. Настройка делится на три "
-"основные стадии: сначала проверим, установлены ли необходимые модули PHP, "
-"затем - установлены ли дополнительные/необходимые программы, а потом вы "
-"укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr ""
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-
 #: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
@@ -7888,36 +7910,26 @@ msgstr "Войти"
 msgid "Click here to log in"
 msgstr "Нажмите на эту кнопку, чтобы войти в систему"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"Ограничение на количество возвращаемых объектов позволяет ускорить операции "
-"поиска и предохраняет сервер LDAP от большой нагрузки. Простейший способ "
-"снизить время обработки запроса при обслуживаии большой базы данных это "
-"установить минимальное значение. Кроме того, будет очень полезно "
-"использовать фильтры для просмотра только ограниченного количества объектов."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Выберите тип реакции для данной сессии"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "игнорировать ошибку и показать все найденые объекты"
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
+msgstr "Добро пожаловать в раздел настройки GOsa!"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-#, fuzzy
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
 msgstr ""
-"Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
-"позволить использовать фильтры"
+"Судя по всему, вы запустили GOsa впервые: файл настройки не найден. Этот "
+"сценарий поможет вам создать рабочую конфигурацию. Настройка делится на три "
+"основные стадии: сначала проверим, установлены ли необходимые модули PHP, "
+"затем - установлены ли дополнительные/необходимые программы, а потом вы "
+"укажете параметры работы с LDAP-сервером, и мы проверим его настройку."
 
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
@@ -7939,20 +7951,6 @@ msgstr "Выход"
 msgid "Signed in:"
 msgstr "Пользователь:"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Конфликт блокировок"
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
-"закрыл браузер во время редактирования данных. Вы можете удалить файл "
-"блокировки, нажав на кнопку <i>Удалить</i>."
-
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -7971,6 +7969,34 @@ msgstr ""
 "На втором шаге происходит поиск вспомогательных программ и проверка "
 "допустимости их версии."
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Конфликт блокировок"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Если результат этой проверки блокировки - ложь, очевидно, другой человек "
+"закрыл браузер во время редактирования данных. Вы можете удалить файл "
+"блокировки, нажав на кнопку <i>Удалить</i>."
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr ""
+
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -8195,6 +8221,19 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#~ msgid "Display lists containing"
+#~ msgstr "Шаблон для содержимого стоп-листов"
+
+#~ msgid "Show lists containing entered numbers"
+#~ msgstr "Показать \"черные списки\", содержащие введенные номера"
+
+#, fuzzy
+#~ msgid "New system"
+#~ msgstr "Удалить"
+
+#~ msgid "Display terminal(s) of user"
+#~ msgstr "Показать терминал(ы) пользователя"
+
 #, fuzzy
 #~ msgid "Germany"
 #~ msgstr "Немецкий"