Added Translation Strings.

Added German Translation.

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

diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo
index e3cccdbf2f6dc8198c2eaaf2b98023c1114cbf25..3b7ef0945daed348cf94aa3e45377faf60df15cd 100644 (file)
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ

diff --git a/locale/de/LC_MESSAGES/messages.po b/locale/de/LC_MESSAGES/messages.po
index 9b43d3f2e7d22668b82e024d9498726b74f70c8a..154383865e8f2736a11af6b25823e306abecd6e9 100644 (file)
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: Alfred Schroeder <schroeder@gonicus.de>\n"
 "POT-Creation-Date: 2003-09-19 13:41+0200\n"
-"PO-Revision-Date: 2005-08-09 16:27+0200\n"
+"PO-Revision-Date: 2005-08-12 12:36+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,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
@@ -60,7 +60,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"
@@ -75,22 +75,22 @@ msgstr "Konnektivit
 #: 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
@@ -121,7 +121,7 @@ msgstr "Zugriffsregeln"
 msgid "Options"
 msgstr "Optionen"
 
-#: 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 "Parameter"
 
@@ -152,9 +152,9 @@ msgid "Export"
 msgstr "Export"
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr "Importieren"
 
@@ -166,7 +166,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 "Deutsch"
 
@@ -194,13 +194,148 @@ msgstr "Englisch"
 msgid "Italian"
 msgstr "Italienisch"
 
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Wählen Sie die hinzuzufügenden Adressen"
+
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Filter"
+
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Zeige die Adressen der Abteilung"
+
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
+
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Zeige die Adressen, auf die das Folgende passt"
+
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Regulärer Ausdruck zum Abgleich mit Mail-Adressen"
+
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Zeige Adressen des Benutzers"
+
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Benutzername, dessen Adressen angezeigt werden"
+
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: 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/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
+#: plugins/admin/groups/group_objects.tpl:49
+#: 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/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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 "Abbrechen"
+
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Primäre Adresse"
 
 #: 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,38 +368,6 @@ msgstr "Alternative Adressen"
 msgid "List of alternative mail addresses"
 msgstr "Liste alternativer 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/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/gofax/blocklists/generic.tpl:63
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:49
-#: 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/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/generic.tpl:13
-msgid "Add"
-msgstr "Hinzufügen"
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
@@ -281,13 +384,13 @@ msgstr "Hinzuf
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/remove.tpl:15
 #: 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/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/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr "Entfernen"
 
@@ -376,6 +479,47 @@ msgstr "Eigenes Sieve-Skript verwenden"
 msgid "disables all Mail options!"
 msgstr "schaltet alle übrigen Mail-Einstellungen aus!"
 
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
+#: plugins/personal/generic/generic_certs.tpl:76
+#: 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/macro/class_gofonMacroManagement.inc:300
+#: plugins/gofon/phoneaccount/main.inc:104
+msgid "Finish"
+msgstr "Speichern"
+
+#: 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 ""
+"Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
+"Dialog zu ändern"
+
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
+#: plugins/personal/connectivity/main.inc:127
+#: plugins/gofax/faxaccount/generic.tpl:90
+#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
+#: plugins/gofon/phoneaccount/main.inc:112
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr "Benutzer Mail-Einstellungen"
+
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
@@ -534,178 +678,21 @@ msgstr "Sie m
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr "Es wurde kein Ordner für die gewählten Spam-Einstellungen angegeben."
 
-#: 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 "Speichern"
+#: plugins/personal/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:659
+msgid "Change password"
+msgstr "Passwort ändern"
 
-#: 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 "Abbrechen"
-
-#: 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 ""
-"Betätigen sie den 'Bearbeiten'-Schalter unten um Informationen in diesem "
-"Dialog zu ändern"
-
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:170
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/gofax/faxaccount/generic.tpl:90
-#: plugins/gofax/faxaccount/generic.tpl:96
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/gofon/phoneaccount/main.inc:112
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr "Benutzer Mail-Einstellungen"
-
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Wählen Sie die hinzuzufügenden Adressen"
-
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
-msgstr "Filter"
-
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Zeige die Adressen der Abteilung"
-
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/gofax/faxaccount/locals.tpl:31
-#: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
-
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Zeige die Adressen, auf die das Folgende passt"
-
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-msgstr "Regulärer Ausdruck zum Abgleich mit Mail-Adressen"
-
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-msgstr "Zeige Adressen des Benutzers"
-
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-msgstr "Benutzername, dessen Adressen angezeigt werden"
-
-#: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:652
-#: 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
-#: 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
-msgid "Password"
-msgstr "Passwort"
-
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:636
-msgid "Change password"
-msgstr "Passwort ändern"
-
-#: plugins/personal/password/password.tpl:6
-msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
-msgstr ""
-"Um das Passwort zu ändern, benutzen Sie das untere Feld. Die Änderung wird "
-"sofort wirksam. Bitte merken Sie sich das neue Passwort, da Sie sich ohne "
-"dieses nicht mehr anmelden können."
+#: plugins/personal/password/password.tpl:6
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
+msgstr ""
+"Um das Passwort zu ändern, benutzen Sie das untere Feld. Die Änderung wird "
+"sofort wirksam. Bitte merken Sie sich das neue Passwort, da Sie sich ohne "
+"dieses nicht mehr anmelden können."
 
 #: plugins/personal/password/password.tpl:10
 #: plugins/admin/users/password.tpl:6
@@ -752,8 +739,8 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
@@ -768,6 +755,18 @@ msgstr ""
 msgid "Back"
 msgstr "Zurück"
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "Passwort"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -781,7 +780,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Sie müssen das aktuelle Passwort eingeben, um fortfahren zu können."
 
 #: 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."
@@ -790,7 +789,7 @@ msgstr ""
 "(Wiederholung)' eingegeben haben sind nicht identisch."
 
 #: 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 ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
@@ -812,6 +811,65 @@ msgstr "Sie haben keine Berechtigung ihr Passwort zu 
 msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
+#: 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
+msgid "Home directory"
+msgstr "Basisverzeichnis"
+
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
+
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "Primäre Gruppe"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Status"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Erzwinge UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Gruppenmitgliedschaft"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Warnung: mehr als 16 Gruppen werden von NFS nicht unterstützt!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Konto"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Umgebung"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Standard-Drucker"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Standard-Sprache"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "System-Vertrauen"
+
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Wählen Sie die hinzuzufügenden Gruppen"
@@ -872,22 +930,22 @@ msgid "Display groups of department"
 msgstr "Zeige Gruppen der Abteilung"
 
 #: 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 "Zeige Gruppen, auf die zutrifft"
 
 #: 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 "Regulärer Ausdruck zum Suchen in Gruppen Namen"
 
 #: 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 "Zeige Gruppen des Benutzers"
 
 #: 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 "Benutzername, dessen Gruppen angezeigt werden"
 
@@ -909,68 +967,13 @@ msgid "Display systems of department"
 msgstr "Zeige die Systeme der Abteilung"
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:51
+#: plugins/admin/systems/headpage.tpl:50
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
-#: 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
-msgid "Home directory"
-msgstr "Basisverzeichnis"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Primäre Gruppe"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Status"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Erzwinge UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Gruppenmitgliedschaft"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Warnung: mehr als 16 Gruppen werden von NFS nicht unterstützt!)"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Konto"
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Umgebung"
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr "Standard-Drucker"
-
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "Standard-Sprache"
-
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "System-Vertrauen"
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "UNIX-Einstellungen"
 
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
@@ -988,7 +991,7 @@ msgstr "unkonfiguriert"
 
 #: 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"
 
@@ -1276,10 +1279,6 @@ msgstr ""
 "Es sind zu viele Benutzer in der Datenbank. Es kann keine freie ID "
 "reserviert werden!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "UNIX-Einstellungen"
-
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Samba-Basisverzeichnis"
@@ -1406,6 +1405,10 @@ msgstr "Konto l
 msgid "Allow connection from these workstations only"
 msgstr "Erlaube Verbindungen nur von diesen Arbeitsstationen"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Samba-Einstellungen"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Wählen Sie die hinzuzufügenden Arbeitsstationen"
@@ -1418,10 +1421,6 @@ msgstr "Zeige die Arbeitsstationen der Abteilung"
 msgid "Display workstations matching"
 msgstr "Zeige die Arbeitsstationen, auf die Folgendes passt"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Samba-Einstellungen"
-
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Dieses Konto hat keine Samba-Erweiterungen."
@@ -1528,42 +1527,171 @@ msgstr ""
 "Warnung: Die primäre Benutzergruppe kann nicht identifiziert werden, kann "
 "daher keine Umwandlung in eine Samba-Gruppe vornehmen!"
 
-#: 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 ""
-"Sie haben die Verschlüsselungsart, mit der Ihr Passwort in der LDAP-"
-"Datenbank gespeichert wird, geändert. Aus diesem Grund müssen Sie das "
-"Passwort an dieser Stelle noch einmal eingeben, damit es von GOsa in der "
-"gewünschten Verschlüsselung abgelegt werden kann."
+#: plugins/personal/generic/class_user.inc:233
+msgid "female"
+msgstr "weiblich"
 
-#: plugins/personal/generic/generic_picture.tpl:6
-#: plugins/personal/generic/generic.tpl:15
-msgid "Personal picture"
-msgstr "Bild"
+#: plugins/personal/generic/class_user.inc:233
+msgid "male"
+msgstr "männlich"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Bild entfernen"
+#: plugins/personal/generic/class_user.inc:243
+msgid "This account has no valid GOsa extensions."
+msgstr "Dieses Konto hat keine gültigen GOsa-Erweiterungen."
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Sichern"
+#: plugins/personal/generic/class_user.inc:272
+msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+msgstr ""
+"Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
+"abgebrochen."
+
+#: plugins/personal/generic/class_user.inc:367
+msgid "Please enter a valid serial number"
+msgstr "Bitte geben Sie eine gültige Seriennummer ein"
+
+#: 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 ""
+"Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
+"s</b>)."
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "valid"
+msgstr "gültig"
+
+#: plugins/personal/generic/class_user.inc:404
+msgid "invalid"
+msgstr "ungültig"
+
+#: plugins/personal/generic/class_user.inc:408
+msgid "No certificate installed"
+msgstr "Kein Zertifikat eingerichtet"
+
+#: plugins/personal/generic/class_user.inc:808
+msgid "Kerberos database communication failed"
+msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
+
+#: plugins/personal/generic/class_user.inc:825
+msgid "Can't remove user from kerberos database."
+msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
+
+#: plugins/personal/generic/class_user.inc:836
+msgid "Can't add user to kerberos database."
+msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
+
+#: plugins/personal/generic/class_user.inc:876
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
+"anzulegen."
+
+#: plugins/personal/generic/class_user.inc:881
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
+"zu verschieben."
+
+#: 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 "Das benötigte Feld 'Name' ist nicht gesetzt."
+
+#: plugins/personal/generic/class_user.inc:896
+msgid "There's already a person with this 'Login' in the database."
+msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
+
+#: 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 "Das benötigte Feld 'Vorname' ist nicht gesetzt."
+
+#: plugins/personal/generic/class_user.inc:905
+msgid "The required field 'Login' is not set."
+msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
+
+#: plugins/personal/generic/class_user.inc:912
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
+"Datenbank vorhanden."
+
+#: plugins/personal/generic/class_user.inc:919
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
+"Bindestriche sind erlaubt."
+
+#: plugins/personal/generic/class_user.inc:922
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
+
+#: 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 "Das Feld 'Name' enthält ungültige Zeichen."
+
+#: 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 "Das Feld 'Vorname' enthält ungültige Zeichen."
+
+#: 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 "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
+
+#: 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 "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
+
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:554
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
+
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:557
+msgid "The field 'Pager' contains an invalid phone number."
+msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
+
+#: plugins/personal/generic/class_user.inc:1070
+msgid "Could not open specified certificate!"
+msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
+#: plugins/personal/generic/generic.tpl:15
+#: plugins/personal/generic/generic_picture.tpl:6
+msgid "Personal picture"
+msgstr "Bild"
+
 #: plugins/personal/generic/generic.tpl:17
 msgid "Change picture"
 msgstr "Bild ändern"
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/address_edit.tpl:22
 #: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/address_edit.tpl:22
 #: 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
@@ -1609,9 +1737,9 @@ msgstr "Geschlecht"
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1674,9 +1802,9 @@ msgstr "Organisation"
 #: 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
@@ -1702,8 +1830,8 @@ msgid "Room No."
 msgstr "Zimmer-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 "Mobiltelefon"
@@ -1780,6 +1908,34 @@ msgstr "letzte 
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
+#: 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 ""
+"Sie haben die Verschlüsselungsart, mit der Ihr Passwort in der LDAP-"
+"Datenbank gespeichert wird, geändert. Aus diesem Grund müssen Sie das "
+"Passwort an dieser Stelle noch einmal eingeben, damit es von GOsa in der "
+"gewünschten Verschlüsselung abgelegt werden kann."
+
+#: plugins/personal/generic/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Bild entfernen"
+
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:114
+msgid "Save"
+msgstr "Sichern"
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern!"
+
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Generische Benutzer-Information"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Standard-Zertifikat"
@@ -1790,7 +1946,7 @@ msgstr "Standard-Zertifikat"
 #: 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 "Entfernen"
@@ -1807,197 +1963,89 @@ msgstr "PKCS12-Zertifikat"
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:233
-msgid "female"
-msgstr "weiblich"
-
-#: plugins/personal/generic/class_user.inc:233
-msgid "male"
-msgstr "männlich"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr "Intranet Konto"
 
-#: plugins/personal/generic/class_user.inc:243
-msgid "This account has no valid GOsa extensions."
-msgstr "Dieses Konto hat keine gültigen GOsa-Erweiterungen."
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Proxy Konto"
 
-#: plugins/personal/generic/class_user.inc:272
-msgid "The specified file has not been uploaded via HTTP POST! Aborted."
+#: plugins/personal/connectivity/proxy.tpl:24
+msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr ""
-"Die angegebene Datei wurde nicht über HTTP POST übertragen! Aktion "
-"abgebrochen."
+"Filtern von ungewollten Inhalten (z.B. pornografische oder gewalttätige "
+"Inhalte)"
 
-#: plugins/personal/generic/class_user.inc:367
-msgid "Please enter a valid serial number"
-msgstr "Bitte geben Sie eine gültige Seriennummer ein"
+#: plugins/personal/connectivity/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Inhaltsfilterung nur während der Arbeitszeit"
 
-#: 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 ""
-"Zertifkat ist gültig im Zeitraum von <b>%s</b> bis <b>%s</b> (momentan: <b>%"
-"s</b>)."
+#: plugins/personal/connectivity/proxy.tpl:69
+msgid "Restrict proxy usage by quota"
+msgstr "Proxynutzung durch Kontingent einschränken"
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "valid"
-msgstr "gültig"
+#: plugins/personal/connectivity/proxy.tpl:80
+msgid "per"
+msgstr "pro"
 
-#: plugins/personal/generic/class_user.inc:404
-msgid "invalid"
-msgstr "ungültig"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "FTP Konto"
 
-#: plugins/personal/generic/class_user.inc:408
-msgid "No certificate installed"
-msgstr "Kein Zertifikat eingerichtet"
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr "Bandbreite"
 
-#: plugins/personal/generic/class_user.inc:808
-msgid "Kerberos database communication failed"
-msgstr "Die Kommunikation mit der Kerberos-Datenbank ist fehlgeschlagen"
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Upload-Bandbreite"
 
-#: plugins/personal/generic/class_user.inc:825
-msgid "Can't remove user from kerberos database."
-msgstr "Benutzer kann nicht aus der Kerberos-Datenbank entfernt werden."
-
-#: plugins/personal/generic/class_user.inc:836
-msgid "Can't add user to kerberos database."
-msgstr "Benutzer kann nicht zur Kerberos-Datenbank hinzugefügt werden."
-
-#: plugins/personal/generic/class_user.inc:876
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Benutzer innerhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/personal/generic/class_user.inc:881
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Benutzer aus der ursprünglichen 'Basis' "
-"zu verschieben."
-
-#: 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 "Das benötigte Feld 'Name' ist nicht gesetzt."
-
-#: plugins/personal/generic/class_user.inc:896
-msgid "There's already a person with this 'Login' in the database."
-msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
-
-#: 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 "Das benötigte Feld 'Vorname' ist nicht gesetzt."
-
-#: plugins/personal/generic/class_user.inc:905
-msgid "The required field 'Login' is not set."
-msgstr "Das benötigte Feld 'Kennung' ist nicht gesetzt."
-
-#: plugins/personal/generic/class_user.inc:912
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Die von Ihnen angegebene Kombination aus 'Name'/'Vorname' ist bereits in der "
-"Datenbank vorhanden."
-
-#: plugins/personal/generic/class_user.inc:919
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"Das Feld 'Kennung' enthält ungültige Zeichen. Kleinbuchstaben, Zahlen und "
-"Bindestriche sind erlaubt."
-
-#: plugins/personal/generic/class_user.inc:922
-msgid "The field 'Homepage' contains an invalid URL definition."
-msgstr "Das Feld 'Homepage' enthält eine ungültige Internetadresse."
-
-#: 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 "Das Feld 'Name' enthält ungültige Zeichen."
-
-#: 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 "Das Feld 'Vorname' enthält ungültige Zeichen."
-
-#: 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 "Das Feld 'Telefon' enthält eine ungültige Telefonnummer."
-
-#: 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 "Das Feld 'Fax' enthält eine ungültige Telefonnummer."
-
-#: plugins/personal/generic/class_user.inc:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
-msgid "The field 'Mobile' contains an invalid phone number."
-msgstr "Das Feld 'Mobil' enthält eine ungültige Telefonnummer"
-
-#: plugins/personal/generic/class_user.inc:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
-msgid "The field 'Pager' contains an invalid phone number."
-msgstr "Das Feld 'Pager' enthält eine ungültige Telefonnummer."
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "kb/s"
 
-#: plugins/personal/generic/class_user.inc:1070
-msgid "Could not open specified certificate!"
-msgstr "Die angegebene Datei konnte nicht geöffnet werden!"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Download-Bandbreite"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern!"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
+msgstr "Kontingent"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Generische Benutzer-Information"
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "Dateien"
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Proxy Konto"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Größe"
 
-#: plugins/personal/connectivity/proxy.tpl:24
-msgid "Filter unwanted content (i.e. pornographic or violence related)"
-msgstr ""
-"Filtern von ungewollten Inhalten (z.B. pornografische oder gewalttätige "
-"Inhalte)"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr "Verhältnis"
 
-#: plugins/personal/connectivity/proxy.tpl:35
-msgid "Limit proxy access to working time"
-msgstr "Inhaltsfilterung nur während der Arbeitszeit"
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "Hoch- / runtergeladene Dateien"
 
-#: plugins/personal/connectivity/proxy.tpl:69
-msgid "Restrict proxy usage by quota"
-msgstr "Proxynutzung durch Kontingent einschränken"
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Wählen Sie diese Option um den FTP-Zugriff zu deaktivieren"
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "pro"
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Temporäres Abschalten des FTP-Zugriffs"
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
-msgstr "Intranet Konto"
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "PHPGroupware Konto"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "PHPGroupware Konto"
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Kolab Konto"
@@ -2044,55 +2092,6 @@ msgstr "Tage"
 msgid "Invitation policy"
 msgstr "Einladungs-Richtlinie"
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
-msgstr "FTP Konto"
-
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Bandbreite"
-
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Upload-Bandbreite"
-
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "kb/s"
-
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Download-Bandbreite"
-
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Kontingent"
-
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "Dateien"
-
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
-msgstr "Größe"
-
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Verhältnis"
-
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "Hoch- / runtergeladene Dateien"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Wählen Sie diese Option um den FTP-Zugriff zu deaktivieren"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Temporäres Abschalten des FTP-Zugriffs"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Open-Xchange Konto"
@@ -2163,6 +2162,10 @@ msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 "Das Numerische Feld der Kontingent-Einstellung enthält einen ungültigen Wert."
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "WebDAV Konto"
+
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr "Intranet"
@@ -2259,10 +2262,6 @@ msgstr "Das Feld 'Gr
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "Das Feld 'Verhältins' enthält eine ungültige Eingabe."
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "WebDAV Konto"
-
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
@@ -2304,29 +2303,124 @@ msgstr "PHP4-Erweiterung f
 msgid "This account has no connectivity extensions."
 msgstr "Dieses Konto hat keine Konnektivitäts-Erweiterungen."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
-msgstr "FAX Sperrlisten"
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Liste der Sperrlisten"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
-msgstr "Sie möchten die Blockliste '%s' löschen."
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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/class_blocklistManagement.inc:217
-msgid "You have no permission to remove this blocklist."
-msgstr "Sie haben keine Berechtigung diese Blockliste zu entfernen."
+#: plugins/gofax/blocklists/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Dieses Menü ermöglicht es Ihnen Sperrlisten hinzuzufügen, zu bearbeiten oder "
+"zu entfernen. Bei einer Vielzahl von Sperrlisten bietet sich die Verwendung "
+"der Bereichswahl an."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
-msgid "Please specify a valid phone number."
-msgstr "Bitte geben Sie eine gültige Telefonnummer an."
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Wählen, um die Sperrlisten für ausgehende Anfragen zu sehen"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:624
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr "Zeige ausgehende Sperrlisten"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr "Wählen, um die eingehende Sperrlisten zu sehen"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr "Zeige eingehende Sperrlisten"
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr "Zeige die Sperrlisten, auf die Folgendes passt"
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr "Regulärer Ausdruck zum Abgleich mit Sperrlisten-Namen"
+
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Listenname"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Name der Sperrliste"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
+
+#: 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 "Typ"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Wählen Sie, ob ein- oder ausgehende Anfragen gefiltert werden sollen"
+
+#: 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 "Beschreibung"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Beschreibender Text zu dieser Sperrliste"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Gesperrte Nummern"
+
+#: plugins/gofax/blocklists/generic.tpl:69
+msgid "Numbers can also contain wild cards."
+msgstr "Nummern können auch Platzhalter enthalten."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
+msgstr "FAX Sperrlisten"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
+#, php-format
+msgid "You're about to delete the blocklist '%s'."
+msgstr "Sie möchten die Blockliste '%s' löschen."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
+msgid "You have no permission to remove this blocklist."
+msgstr "Sie haben keine Berechtigung diese Blockliste zu entfernen."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
+msgid "Please specify a valid phone number."
+msgstr "Bitte geben Sie eine gültige Telefonnummer an."
+
+#: 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: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"
@@ -2334,10 +2428,10 @@ msgstr "Eine Abteilung nach oben"
 
 #: 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
@@ -2346,10 +2440,10 @@ msgstr "Auf"
 
 #: 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"
@@ -2357,10 +2451,10 @@ msgstr "Gehe zur Wurzel-Abteilung"
 
 #: 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"
@@ -2368,9 +2462,9 @@ msgstr "Wurzel"
 
 #: 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"
@@ -2378,10 +2472,10 @@ msgstr "Gehe zur Abteilung des Benutzers"
 
 #: 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"
@@ -2397,10 +2491,10 @@ msgstr "Neue Sperrlisten"
 
 #: 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"
@@ -2408,10 +2502,10 @@ msgstr "Momentane Basis"
 
 #: 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"
@@ -2419,10 +2513,10 @@ msgstr "Aktualisieren"
 
 #: 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,34 +2524,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 "Bearbeiten"
 
 #: 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 "Benutzer bearbeiten"
 
 #: 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 "Entfernen"
 
 #: 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 "Benutzer entfernen"
@@ -2469,10 +2563,10 @@ msgstr "Name der Sperrliste"
 #: 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"
@@ -2514,63 +2608,6 @@ msgstr ""
 "Sie haben keine Berechtigung, eine Sperrliste unterhalb dieser Basis "
 "anzulegen."
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Listenname"
-
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Name der Sperrliste"
-
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Wählen Sie den Teilbaum, in den die Sperrliste plaziert werden soll."
-
-#: 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 "Typ"
-
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Wählen Sie, ob ein- oder ausgehende Anfragen gefiltert werden sollen"
-
-#: 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 "Beschreibung"
-
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Beschreibender Text zu dieser Sperrliste"
-
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Gesperrte Nummern"
-
-#: 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 "Nummern können auch Platzhalter enthalten."
-
 #: 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
@@ -2601,52 +2638,6 @@ msgstr ""
 "Wenn Sie sicher sind, drücken Sie <i>Löschen</i> um fortzufahren oder "
 "<i>Abbrechen</i> zum Abbruch."
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Liste der Sperrlisten"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"Dieses Menü ermöglicht es Ihnen Sperrlisten hinzuzufügen, zu bearbeiten oder "
-"zu entfernen. Bei einer Vielzahl von Sperrlisten bietet sich die Verwendung "
-"der Bereichswahl an."
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Wählen, um die Sperrlisten für ausgehende Anfragen zu sehen"
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Zeige ausgehende Sperrlisten"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Wählen, um die eingehende Sperrlisten zu sehen"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Zeige eingehende Sperrlisten"
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Display lists matching"
-msgstr "Zeige die Sperrlisten, auf die Folgendes passt"
-
-#: plugins/gofax/blocklists/headpage.tpl:51
-msgid "Regular expression for matching list names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Sperrlisten-Namen"
-
-#: plugins/gofax/blocklists/headpage.tpl:62
-msgid "Display lists containing"
-msgstr "Zeige Listen die folgendes enthalten"
-
-#: plugins/gofax/blocklists/headpage.tpl:65
-msgid "Show lists containing entered numbers"
-msgstr "Zeige die Sperrlisten, die die eingegebenen Nummer enthalten"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Sperrlistenverwaltung"
@@ -2824,6 +2815,69 @@ msgstr ""
 "'Fax an Drucker weiterleiten' ist nur möglich, wenn ein gültiger Drucker "
 "angegeben wurde. Bitte korrigieren Sie Ihre Auswahl."
 
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
+msgstr "Filter"
+
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
+msgstr "Suche nach"
+
+#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+msgid "Enter user name to search for"
+msgstr "Benutzername nach dem gesucht werden soll"
+
+#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
+#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+msgid "in"
+msgstr "in"
+
+#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+msgid "Select subtree to base search on"
+msgstr "Wählen Sie den Teilbaum in dem gesucht werden soll"
+
+#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+msgid "during"
+msgstr "während"
+
+#: plugins/gofax/reports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+msgid "Search"
+msgstr "Suchen"
+
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr "Benutzer"
+
+#: plugins/gofax/reports/contents.tpl:31
+#: plugins/addons/logview/contents.tpl:84
+#: plugins/gofon/reports/contents.tpl:30
+msgid "Date"
+msgstr "Datum"
+
+#: plugins/gofax/reports/contents.tpl:33
+msgid "Sender"
+msgstr "Absender"
+
+#: plugins/gofax/reports/contents.tpl:34
+msgid "Receiver"
+msgstr "Empfänger"
+
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr "# Seiten"
+
+#: plugins/gofax/reports/contents.tpl:47
+#: plugins/addons/logview/contents.tpl:97
+#: plugins/gofon/reports/contents.tpl:48
+msgid "Search returned no results..."
+msgstr "Die Suche verlief ergebnislos..."
+
 #: plugins/gofax/reports/detail.tpl:6
 msgid "FAX preview - please wait"
 msgstr "FAX Vorschau - bitte warten"
@@ -2836,11 +2890,6 @@ msgstr "Klicken Sie auf das FAX um es herunterzuladen"
 msgid "FAX ID"
 msgstr "FAX-ID"
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr "Benutzer"
-
 #: plugins/gofax/reports/detail.tpl:26
 msgid "Date / Time"
 msgstr "Datum / Zeit"
@@ -2869,9 +2918,9 @@ msgstr "Status-Nachricht"
 msgid "Transfer time"
 msgstr "Übertragungszeit"
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr "# Seiten"
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "FAX-Berichte"
 
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
@@ -2906,121 +2955,12 @@ msgstr "Sie haben keine Berechtigung ein FAX mit dieser ID einzusehen!"
 msgid "Y-M-D"
 msgstr "D.M.Y"
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
-msgstr "Filter"
-
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
-msgstr "Suche nach"
-
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
-msgid "Enter user name to search for"
-msgstr "Benutzername nach dem gesucht werden soll"
-
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
-msgid "in"
-msgstr "in"
-
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
-msgid "Select subtree to base search on"
-msgstr "Wählen Sie den Teilbaum in dem gesucht werden soll"
-
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
-msgid "during"
-msgstr "während"
-
-#: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-msgid "Search"
-msgstr "Suchen"
-
-#: plugins/gofax/reports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
-msgid "Date"
-msgstr "Datum"
-
-#: plugins/gofax/reports/contents.tpl:33
-msgid "Sender"
-msgstr "Absender"
-
-#: plugins/gofax/reports/contents.tpl:34
-msgid "Receiver"
-msgstr "Empfänger"
-
-#: plugins/gofax/reports/contents.tpl:47
-#: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
-msgid "Search returned no results..."
-msgstr "Die Suche verlief ergebnislos..."
-
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "FAX-Berichte"
-
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Wähle Verbindung..."
-
-#: 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 "Wähle"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Wählen Sie die Abteilung in der der Eintrag abgelegt werden soll"
-
-#: plugins/addons/addressbook/address_edit.tpl:18
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Persönlich"
-
-#: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Initialien"
-
-#: 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 "Privat"
 
-#: 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 "Organisationsbezogen"
-
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Firma"
-
-#: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Stadt"
-
-#: plugins/addons/addressbook/address_edit.tpl:84
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Land"
-
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Kontakt"
@@ -3079,6 +3019,18 @@ msgstr "W
 msgid "Search string"
 msgstr "Suchtext"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Wähle Verbindung..."
+
+#: 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 "Wähle"
+
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3089,6 +3041,45 @@ msgstr ""
 "prüfen Sie genau, da es keine Möglichkeit für GOsa gibt, die Daten zu "
 "restaurieren. "
 
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Wählen Sie die Abteilung in der der Eintrag abgelegt werden soll"
+
+#: plugins/addons/addressbook/address_edit.tpl:18
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Persönlich"
+
+#: plugins/addons/addressbook/address_edit.tpl:29
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Initialien"
+
+#: 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 "Organisationsbezogen"
+
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Firma"
+
+#: plugins/addons/addressbook/address_edit.tpl:78
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Stadt"
+
+#: plugins/addons/addressbook/address_edit.tpl:84
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Land"
+
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Adressbuch"
@@ -3183,6 +3174,52 @@ msgstr ""
 "Sie haben keine Berechtigung einen Eintrag unterhalb dieser 'Basis' "
 "anzulegen."
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+"Das CSV Import Plugin stellt Methoden bereit, um Benutzerkonten aus einer "
+"CSV Datei zu generieren. Der Administrator kann die Zuordnung zwischen "
+"Spalte und Benutzerattribut frei wählen. Es müssen jedoch mindestens die "
+"Attribute UID, GIVENNAME und SURENAME gesetzt sein."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr "Wählen die zu importierende CSV Datei"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr "Durchsuchen"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr "Wähle Vorlage"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr "Alle Einträge wurden erfolgreich in die LDAP-Datenbank geschrieben."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr "Es gab einen Fehler während des Importvorgangs Ihrer Daten."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr "Hier ist der Statusreport vom Import:"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr "Gewählte Vorlage"
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr "LDAP-Manager"
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3253,11 +3290,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr "Importiere LDIF Datei"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr "Durchsuchen"
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr "Bearbeite vorhandene Attribute"
@@ -3270,42 +3302,6 @@ msgstr "Existierenden Eintrag 
 msgid "Import successful"
 msgstr "Import erfolgreich"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-"Das CSV Import Plugin stellt Methoden bereit, um Benutzerkonten aus einer "
-"CSV Datei zu generieren. Der Administrator kann die Zuordnung zwischen "
-"Spalte und Benutzerattribut frei wählen. Es müssen jedoch mindestens die "
-"Attribute UID, GIVENNAME und SURENAME gesetzt sein."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr "Wählen die zu importierende CSV Datei"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr "Wähle Vorlage"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Alle Einträge wurden erfolgreich in die LDAP-Datenbank geschrieben."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr "Es gab einen Fehler während des Importvorgangs Ihrer Daten."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr "Hier ist der Statusreport vom Import:"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr "Gewählte Vorlage"
-
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr ""
@@ -3356,11 +3352,6 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr "Hier klicken, um die exportierten Daten in eine Datei zu speichern"
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr "LDAP-Manager"
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr "CSV-Import"
@@ -3374,6 +3365,42 @@ msgstr ""
 msgid "Error while exporting the requested entries!"
 msgstr "Fehler"
 
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr "Zeige Rechner"
+
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr "Priorität"
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr "Zeit-Intervall"
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr "Zu suchende Zeichenkette"
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr "Regelsatz"
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr "Level"
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr "Hostname"
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr "Nachricht"
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr "System Protokolle"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "System Protokolle"
@@ -3433,41 +3460,19 @@ msgstr ""
 "Die LOG-Datenbank kann nicht erreicht werden. Es können keine Protokolle "
 "angezeigt werden!"
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Zeige Rechner"
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Priorität"
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Zeit-Intervall"
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Zu suchende Zeichenkette"
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Regelsatz"
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Level"
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Hostname"
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Nachricht"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Liste der Gruppen"
 
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
-msgstr "System Protokolle"
+#: 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 ""
+"Dieses Menü erlaubt es Ihnen Gruppen hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
+"Bereichsauswahl an."
 
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
@@ -3493,6 +3498,18 @@ msgstr "Mitglieder-Berechtigungen"
 msgid "Forward messages to non group members"
 msgstr "Weiterleiten der Nachrichten an nicht-Gruppenmitglieder"
 
+#: 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 ""
+"Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
+"die Daten nicht wiederherstellen kann."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Gruppenverwaltung"
+
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:42
 msgid "Groups"
@@ -3532,7 +3549,7 @@ msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
 #: 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"
 
@@ -3549,7 +3566,7 @@ msgid "Groupname"
 msgstr "Name der Gruppe"
 
 #: 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
@@ -3613,31 +3630,29 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "Eine Gruppe mit diesem Namen existiert bereits."
 
-#: 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 ""
-"Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
-"die Daten nicht wiederherstellen kann."
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
+msgstr "Verwendete Anwendungen"
 
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Gruppenverwaltung"
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Parameter bearbeiten"
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Liste der Gruppen"
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Optionale Anwendungsparameter bearbeiten"
 
-#: 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 ""
-"Dieses Menü erlaubt es Ihnen Gruppen hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
-"Bereichsauswahl an."
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr "Verfügbare Anwendungen"
+
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Objekt"
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Anwenden dieser Zugriffsregel nur auf Einträge des Eigentümers"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3688,55 +3703,9 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Bitte wählen Sie einen gültigen Mail-Server."
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Objekt"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Anwenden dieser Zugriffsregel nur auf Einträge des Eigentümers"
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Verwendete Anwendungen"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Parameter bearbeiten"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Optionale Anwendungsparameter bearbeiten"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Verfügbare Anwendungen"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Wählen Sie die hinzuzufügenden Benutzer"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr "Zeige die Benutzer der Abteilung"
-
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48 plugins/admin/users/headpage.tpl:49
-msgid "Display users matching"
-msgstr "Zeige die Benutzer, auf die Folgendes passt"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Benutzernamen"
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr "Diese 'dn' enthält keine Zugriffserweiterungen."
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr "Alle Felder sind änderbar"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Ordner-Administratoren"
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -3783,9 +3752,31 @@ msgstr "Mitglieder sind in einer 
 msgid "Group members"
 msgstr "Gruppenmitglieder"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Ordner-Administratoren"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Wählen Sie die hinzuzufügenden Benutzer"
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr "Zeige die Benutzer der Abteilung"
+
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+msgid "Display users matching"
+msgstr "Zeige die Benutzer, auf die Folgendes passt"
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr "Regulärer Ausdruck zum Abgleich mit Benutzernamen"
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr "Diese 'dn' enthält keine Zugriffserweiterungen."
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+msgstr "Alle Felder sind änderbar"
 
 #: plugins/admin/groups/application_options.tpl:1
 msgid "Application options"
@@ -3836,109 +3827,197 @@ msgstr ""
 "Die Applikation mit dem Namen %s ist nicht mehr verfügbar und wurde aus der "
 "Liste entfernt."
 
-#: plugins/admin/users/password.tpl:2
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Liste der Benutzer"
+
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
 msgstr ""
-"Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die "
-"Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
-"Benutzer ohne dieses Passwort nicht anmelden kann."
+"Dieses Menü ermöglicht es Ihnen Benutzer hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Benutzern bietet sich die Verwendung der "
+"Bereichsauswahl an."
 
-#: plugins/admin/users/class_userManagement.inc:25
-msgid "Users"
-msgstr "Benutzer"
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Wählen Sie dies um Vorlagen für Benutzer anzuzeigen"
 
-#: 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 "Es Ihnen nicht erlaubt das Passwort dieses Benutzers zu setzen!"
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr "Zeige Vorlagen"
 
-#: plugins/admin/users/class_userManagement.inc:326
-#, php-format
-msgid "You're about to delete the user %s."
-msgstr "Sie löschen gerade den Benutzer %s."
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr "Auswählen, um die Benutzer anzuzeigen, die nur ein GOsa-Objekt haben"
 
-#: plugins/admin/users/class_userManagement.inc:332
-#: plugins/admin/users/class_userManagement.inc:360
-msgid "You are not allowed to delete this user!"
-msgstr "Es ist Ihnen nicht erlaubt, diesen Benutzer zu löschen!"
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Zeige zweckbezogene Benutzer"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr "Auswählen, um die Benutzer mit UNIX-Konto zu sehen"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr "Zeige UNIX-Benutzer"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr "Auswählen, um die Benutzer zu sehen die eine Mail-Erweiterung besitzen"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Zeige Mail-Benutzer"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr "Auswählen, um die Benutzer zu sehen die SAMBA-Einstellungen besitzen"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Zeige SAMBA-Benutzer"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr "Auswählen, um die Benutzer zu sehen die Proxy-Einstellungen besitzen"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Zeige Proxy-Benutzer"
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"Dies umfasst alle Konto-Informationen, Zugriffsregeln, IMAP-Einstellungen, "
+"etc. dieses Benutzers. Bitte prüfen Sie genau, da es keine Möglichkeit für "
+"GOsa gibt, die Daten wiederherzustellen. "
+
+#: plugins/admin/users/password.tpl:2
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
+msgstr ""
+"Um das Benutzer-Passwort zu ändern, nutzen Sie die Felder unten. Die "
+"Änderungen werden sofort wirksam. Merken Sie sich das Passwort, da sich der "
+"Benutzer ohne dieses Passwort nicht anmelden kann."
+
+#: plugins/admin/users/class_userManagement.inc:25
+msgid "Users"
+msgstr "Benutzer"
+
+#: 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 "Es Ihnen nicht erlaubt das Passwort dieses Benutzers zu setzen!"
+
+#: plugins/admin/users/class_userManagement.inc:349
+#, php-format
+msgid "You're about to delete the user %s."
+msgstr "Sie löschen gerade den Benutzer %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 "Es ist Ihnen nicht erlaubt, diesen Benutzer zu löschen!"
 
-#: plugins/admin/users/class_userManagement.inc:450
+#: plugins/admin/users/class_userManagement.inc:473
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "keine"
 
-#: 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 ""
 "Ein Person mit dem ausgewählten Namen ist in diesem Baum bereits angelegt."
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:628
+#: plugins/admin/users/class_userManagement.inc:651
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:636
+#: plugins/admin/users/class_userManagement.inc:659
 msgid "password"
 msgstr "Passwort"
 
-#: 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/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Benutzername"
 
-#: 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 "Diese Tabelle enthält alle Benutzer dieses Unterbaums."
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:683
+#: plugins/admin/users/class_userManagement.inc:706
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:684
+#: plugins/admin/users/class_userManagement.inc:708
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:685
+#: plugins/admin/users/class_userManagement.inc:710
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:686
+#: plugins/admin/users/class_userManagement.inc:712
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:687
+#: plugins/admin/users/class_userManagement.inc:714
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:715
+msgid "Create user from template"
+msgstr "Neuen Benutzer aus Vorlage erstellen"
+
+#: plugins/admin/users/class_userManagement.inc:716
+msgid "Create user with this template"
+msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
+
+#: plugins/admin/users/class_userManagement.inc:771
+msgid "Online"
+msgstr "aktiv"
+
+#: plugins/admin/users/class_userManagement.inc:778
+msgid "Offline"
+msgstr "inaktiv"
+
+#: plugins/admin/users/class_userManagement.inc:980
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:701
+#: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
 msgstr "Vorlage"
 
@@ -3968,120 +4047,32 @@ msgstr ""
 msgid "Continue"
 msgstr "Fortsetzen"
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Dies umfasst alle Konto-Informationen, Zugriffsregeln, IMAP-Einstellungen, "
-"etc. dieses Benutzers. Bitte prüfen Sie genau, da es keine Möglichkeit für "
-"GOsa gibt, die Daten wiederherzustellen. "
-
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "Liste der Benutzer"
-
-#: plugins/admin/users/headpage.tpl:24
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
-msgstr ""
-"Dieses Menü ermöglicht es Ihnen Benutzer hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Benutzern bietet sich die Verwendung der "
-"Bereichsauswahl an."
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Wählen Sie dies um Vorlagen für Benutzer anzuzeigen"
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr "Zeige Vorlagen"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr "Auswählen, um die Benutzer anzuzeigen, die nur ein GOsa-Objekt haben"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Zeige zweckbezogene Benutzer"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Auswählen, um die Benutzer mit UNIX-Konto zu sehen"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Zeige UNIX-Benutzer"
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Auswählen, um die Benutzer zu sehen die eine Mail-Erweiterung besitzen"
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Zeige Mail-Benutzer"
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Auswählen, um die Benutzer zu sehen die SAMBA-Einstellungen besitzen"
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Zeige SAMBA-Benutzer"
-
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Auswählen, um die Benutzer zu sehen die Proxy-Einstellungen besitzen"
-
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Zeige Proxy-Benutzer"
-
 #: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
 msgid "User administration"
 msgstr "Benutzerverwaltung"
 
-#: plugins/admin/applications/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Optionen entfernen"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr ""
-"Diese Anwendung hat Optionen. Sie können diese durch Betätigen der "
-"Schaltfläche unten entfernen."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Optionen aktivieren"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Liste der Anwendungen"
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: plugins/admin/applications/headpage.tpl:24
 msgid ""
-"This application has options disabled. You can enable them by clicking below."
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
 msgstr ""
-"Diese Anwendung hat keine Optionen. Sie können diese durch Betätigen der "
-"Schaltfläche unten hinzufügen."
-
-#: 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 "Standardwert"
+"Dieses Menü ermöglicht es Ihnen Anwendungen hinzuzufügen, zu bearbeiten oder "
+"zu entfernen. Bei einer Vielzahl von Anwendungen bietet sich die Verwendung "
+"der Bereichsauswahl an."
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Option hinzufügen"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
+msgstr "Zeige die Anwendungen, auf die das Folgende passt"
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
+msgstr "Regulärer Ausdruck zum Abgleich mit Anwendungsnamen"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -4090,7 +4081,7 @@ msgid "Application name"
 msgstr "Name der Anwendung"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -4141,6 +4132,45 @@ msgstr "Platziere das Symbol auf dem Desktop der Gruppenmitglieder"
 msgid "Place entry in members startmenu"
 msgstr "Platziere einen Eintrag im Startmenü der Gruppenmitglieder"
 
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Optionen entfernen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr ""
+"Diese Anwendung hat Optionen. Sie können diese durch Betätigen der "
+"Schaltfläche unten entfernen."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Optionen aktivieren"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Diese Anwendung hat keine Optionen. Sie können diese durch Betätigen der "
+"Schaltfläche unten hinzufügen."
+
+#: 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 "Standardwert"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Option hinzufügen"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "Der von Ihnen angegebene Optionsname '%s' ist ungültig."
+
 #: 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 "
@@ -4150,33 +4180,10 @@ msgstr ""
 "überprüfen Sie genau was Sie tun, da GOsa keine Möglichkeit hat, die Daten "
 "wiederherzustellen."
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Liste der Anwendungen"
-
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
-msgstr ""
-"Dieses Menü ermöglicht es Ihnen Anwendungen hinzuzufügen, zu bearbeiten oder "
-"zu entfernen. Bei einer Vielzahl von Anwendungen bietet sich die Verwendung "
-"der Bereichsauswahl an."
-
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
-msgstr "Zeige die Anwendungen, auf die das Folgende passt"
-
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
-msgstr "Regulärer Ausdruck zum Abgleich mit Anwendungsnamen"
-
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
-msgstr "Anwendungsverwaltung"
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
+msgstr "Anwendungsverwaltung"
 
 #: plugins/admin/applications/class_applicationGeneric.inc:63
 msgid "This 'dn' is no application."
@@ -4223,6 +4230,28 @@ msgstr "Neu"
 msgid "Create new application"
 msgstr "Neu Anwendung erstellen"
 
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr "Liste der Abteilungen"
+
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+"Dieses Menü erlaubt es Ihnen Abteilungen hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Abteilungen bietet sich die Verwendung der "
+"Bereichswahl an."
+
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr "Zeige Abteilungen, auf die zutrifft"
+
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
+msgstr "Regulärer Ausdruck zur Suche nach Abteilungs-Namen"
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Name der Abteilung"
@@ -4287,29 +4316,6 @@ msgstr ""
 "drücken Sie <i>Beenden</i> um Fortzufahren oder <i>Abbrechen</i>, um den "
 "Vorgang zu beenden."
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Liste der Abteilungen"
-
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
-msgstr ""
-"Dieses Menü erlaubt es Ihnen Abteilungen hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Abteilungen bietet sich die Verwendung der "
-"Bereichswahl an."
-
-#: plugins/admin/departments/headpage.tpl:38
-#: plugins/admin/departments/headpage.tpl:41
-msgid "Display departments matching"
-msgstr "Zeige Abteilungen, auf die zutrifft"
-
-#: plugins/admin/departments/headpage.tpl:45
-msgid "Regular expression for matching department names"
-msgstr "Regulärer Ausdruck zur Suche nach Abteilungs-Namen"
-
 #: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
 msgid "Department management"
 msgstr "Abteilungsverwaltung"
@@ -4377,6 +4383,18 @@ msgstr "Abteilung"
 msgid ".."
 msgstr ".."
 
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
+msgstr "Netzwerk-Einstellungen"
+
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
+msgstr "IP-Adresse"
+
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr "MAC-Adresse"
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4415,46 +4433,37 @@ msgstr "unbekannter Status"
 msgid "offline"
 msgstr "inaktiv"
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Netzwerk-Einstellungen"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "NFS-Freigabe"
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
-msgstr "IP-Adresse"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Zeit-Dienst"
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr "MAC-Adresse"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "LDAP-Dienst"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Terminal-Dienst"
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
-msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Anmeldung sperren (temporär)"
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
-"anzulegen."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Schrift-Suchpfad"
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr ""
-"Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Protokoll-Dienst"
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Druck-Dienst"
 
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
@@ -4552,6 +4561,120 @@ msgstr "Audio-Dienst"
 msgid "GUI"
 msgstr "GUI"
 
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr "Diese 'dn' hat keine Netzwerk-Erweiterungen."
+
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
+msgstr "Das benötigte Feld 'Gerätename' ist nicht gesetzt."
+
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, eine Komponente unterhalb dieser 'Basis' "
+"anzulegen."
+
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr ""
+"Der Eintrag '%s' ist in der von Ihnen ausgewählten Basis bereits vorhanden"
+
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Systemverwaltung"
+
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Terminal-Vorlage"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Terminal-Name"
+
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
+
+#: 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 "Wählen Sie den 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 "Wählen Sie das NFS-Root-Dateisystem"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Auslagerungs-Server"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
+"werden sollen"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Protokoll-Server"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "Zeit-Server"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
+
+#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Aktion"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
+
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr "Standard"
@@ -4590,67 +4713,41 @@ msgstr "Bitte geben Sie einen g
 msgid "Please specify a valid HSync range."
 msgstr "Bitte geben Sie einen gültigen HSync-Bereich an."
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Systemverwaltung"
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
+msgstr "Server-Name"
+
+#: plugins/admin/systems/server.tpl:42
+msgid "Select action to execute for this server"
+msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Telefon-Name"
 
 #: plugins/admin/systems/class_servService.inc:177
 msgid "Terminal server, must have fontpath specified."
 msgstr "Terminal-Server benötigt einen Schrift-Suchpfad"
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "NFS-Freigabe"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Zeit-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "LDAP-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Terminal-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Anmeldung sperren (temporär)"
-
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Schrift-Suchpfad"
-
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Protokoll-Dienst"
-
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Druck-Dienst"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Vorlage für Arbeitsstation"
 
-#: plugins/admin/systems/server.tpl:6
-msgid "Server name"
-msgstr "Server-Name"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Name der Arbeitsstation"
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Wählen Sie die Abteilung, in die das Terminal eingepflegt werden soll"
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Druckername"
 
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Aktion"
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "Drucker URL"
 
-#: plugins/admin/systems/server.tpl:42
-msgid "Select action to execute for this server"
-msgstr "Wählen Sie die auszuführende Aktion für diesen Server"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Pfad zum PPD"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
@@ -4729,10 +4826,6 @@ msgstr ""
 msgid "The required field 'Terminal name' is not set."
 msgstr "Das benötigte Feld 'Terminal-Name' ist nicht gesetzt."
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Telefon-Name"
-
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Diese 'dn' hat keine Server-Erweiterungen."
@@ -4747,73 +4840,6 @@ msgstr ""
 "Sie haben keine Berechtigung, einen Server unterhalb dieser 'Basis' "
 "anzulegen."
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Terminal-Vorlage"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Terminal-Name"
-
-#: 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 "Wählen Sie den 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 "Wählen Sie das NFS-Root-Dateisystem"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Auslagerungs-Server"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Wählen Sie das NFS-Dateisystem, in dem die Auslagerungsdateien abgelegt "
-"werden sollen"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Protokoll-Server"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Wählen Sie den Server, der für das Protokollieren genutzt werden soll"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Zeit-Server"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-"Wählen Sie den Server, der zur Zeit-Synchronisation genutzt werden soll"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Wählen Sie die auszuführende Aktion für dieses Terminal"
-
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "DHCP-Dienst entfernen"
@@ -4856,178 +4882,235 @@ msgstr "Das ben
 msgid "Systems"
 msgstr "Systeme"
 
-#: plugins/admin/systems/class_systemManagement.inc:323
+#: plugins/admin/systems/class_systemManagement.inc:322
 msgid "You can't edit this object type yet!"
 msgstr "Dieser Objekt-Typ kann momentan noch nicht bearbeitet werden!"
 
-#: 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 ""
 "Die Passworte, die Sie als 'Neues Passwort' und 'Wiederholung des neuen "
 "Passwort' eingegeben haben sind nicht identisch!"
 
-#: 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 "Es Ihnen nicht erlaubt das Passwort für dieses Systems zu setzen!"
 
-#: 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 ""
 "Sie sind dabei, alle Informationen über die Komponente auf '%s' zu löschen."
 
-#: 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 "Es ist Ihnen nicht erlaubt, diese Komponente zu löschen!"
 
-#: 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 "Neues 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 "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:559
 msgid "New Server"
 msgstr "Neuer Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:560
 msgid "New Printer"
 msgstr "Neuer Drucker"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:561
 msgid "New Phone"
 msgstr "Neues Telefon"
 
-#: plugins/admin/systems/class_systemManagement.inc:563
+#: plugins/admin/systems/class_systemManagement.inc:562
 msgid "New Component"
 msgstr "Neue Netzwerk-Komponente"
 
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "Create new system"
-msgstr "Neues System erstellen"
-
-#: plugins/admin/systems/class_systemManagement.inc:565
-msgid "New system"
-msgstr "Neues System"
-
-#: plugins/admin/systems/class_systemManagement.inc:573
+#: plugins/admin/systems/class_systemManagement.inc:570
 msgid "Edit system"
 msgstr "System bearbeiten"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
+#: plugins/admin/systems/class_systemManagement.inc:571
 msgid "Delete system"
 msgstr "Entferne System"
 
-#: plugins/admin/systems/class_systemManagement.inc:580
+#: plugins/admin/systems/class_systemManagement.inc:577
 msgid "System"
 msgstr "Systeme"
 
-#: 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 "Diese Tabelle enthält alle Systeme des gewählten Unterbaumes."
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:614
 msgid "Cups Server"
 msgstr "CUPS Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:615
 msgid "Log Db"
 msgstr "Log-DB"
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:616
 msgid "Syslog Server"
 msgstr "Syslog-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:617
 msgid "Mail Server"
 msgstr "Mail-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:618
 msgid "Imap Server"
 msgstr "IMAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:619
 msgid "Nfs Server"
 msgstr "NFS-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:620
 msgid "Kerberos Server"
 msgstr "Kerberos-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
+#: plugins/admin/systems/class_systemManagement.inc:621
 msgid "Asterisk Server"
 msgstr "Asterisk-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
+#: plugins/admin/systems/class_systemManagement.inc:622
 msgid "Fax Server"
 msgstr "FAX-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
+#: plugins/admin/systems/class_systemManagement.inc:623
 msgid "Ldap Server"
 msgstr "LDAP-Server"
 
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:649
 msgid "Set root password"
 msgstr "root-Passwort setzen"
 
-#: 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 "Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/systems/class_systemManagement.inc:706
 msgid "Winstation"
 msgstr "Windows-Workstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/systems/class_systemManagement.inc:707
 msgid "Network Device"
 msgstr "Netzwerk-Gerät"
 
-#: 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 "Drucker"
 
-#: plugins/admin/systems/class_systemManagement.inc:895
+#: plugins/admin/systems/class_systemManagement.inc:893
 msgid "New terminal"
 msgstr "Neues Terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:898
+#: plugins/admin/systems/class_systemManagement.inc:896
 msgid "New workstation"
 msgstr "Neue Arbeitsstation"
 
-#: plugins/admin/systems/class_systemManagement.inc:915
+#: plugins/admin/systems/class_systemManagement.inc:913
 msgid "Terminal template for"
 msgstr "Terminal-Vorlage für"
 
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:924
 msgid "Workstation template for"
 msgstr "Arbeitsstations-Vorlage für"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Druckername"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "POP3 Dienst"
 
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "Drucker URL"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "POP3/SSL Dienst"
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Pfad zum PPD"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "IMAP Dienst"
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "IMAP/SSL Dienst"
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Sieve Dienst"
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr "FTP Frei/Belegt-Dienst (alt, inkompatibel mit Kolab 2)"
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "HTTP Frei/Belegt-Dienst (alt)"
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Email Scannen (Virus/Spam)"
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Kontingent-Einstellungen"
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Frei/Belegt-Einstellungen"
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+"Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "SMTP privilegierte Netzwerke"
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Rechner/Netzwerke denen Weiterleitung erlaubt ist"
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr "Eingabe mehrerer Werte, getrennt durch"
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhost"
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Aktiviere MX lookup für relayhost"
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Host für Mail Relay"
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Akzeptiere Internet Mail"
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -5051,39 +5134,6 @@ msgstr ""
 "Aktuell hat dieser Server keine DNS-Funktionen aktiviert. Sie können diese "
 "durch einen Klick auf die Schaltfläche unten aktivieren."
 
-#: 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 "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
-
-#: plugins/admin/systems/class_servDB.inc:137
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
-
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr "Der Sieve-Port muss numerisch sein."
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr ""
-"Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
-"sein."
-
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Vorlage für Arbeitsstation"
-
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Name der Arbeitsstation"
-
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr "Kerberos Kadmin Zugang"
@@ -5144,6 +5194,130 @@ msgstr "Protokoll-Datenbank"
 msgid "Logging DB user"
 msgstr "Protokoll-DB Benutzer"
 
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Name des Systems"
+
+#: 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 "Das Attribut '%s' ist leer oder enthält ungültige Zeichen."
+
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "Der IMAP-Verbindungsstring muss in der Form '%s' sein."
+
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "Der Sieve-Port muss numerisch sein."
+
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
+"Das Feld 'Serverbezeichnung' muss entweder ein Hostname oder eine IP-Adresse "
+"sein."
+
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Liste der Systeme"
+
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Mit diesem Menü können Sie Systeme hinzufügen, diese löschen oder die "
+"Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
+"hinzufügen, die bereits einmal im Netz gestartet wurden."
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr "Wählen um Server anzuzeigen"
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Zeige Server"
+
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Wählen, um Linux Terminals zu sehen"
+
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Zeige Terminals"
+
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Wählen, um Linux Arbeitsstationen zu sehen"
+
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Zeige Arbeitsstationen"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Auswählen um Microsoft Windows Arbeitsstationen zu sehen"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Zeige Windows basierte Arbeitsstationen"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Zeige Netzwerk-Drucker"
+
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
+
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Zeige Telefone"
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Wählen, um Netzwerk-Geräte zu sehen"
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Zeige Netzwerk-Geräte"
+
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Regulärer Ausdruck für System-Namen"
+
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Zeige Systeme des Benutzers"
+
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
+
+#: 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 ""
+"Dies umfasst <b>alle</b> System- und Setup-Informationen Bitte prüfen Sie "
+"genau, da es keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
+
 #: plugins/admin/systems/class_servKolab.inc:112
 msgid "Remove Kolab extension"
 msgstr "Kolab Erweiterung entfernen"
@@ -5181,119 +5355,42 @@ msgid "Warn users when using more than %s%% of their mail quota"
 msgstr "Warne Benutzer, wenn sie mehr als %s%% ihres Mail-Kontigentes benutzen"
 
 #: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
-
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
-
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
-msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
-
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
-
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
-msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
-
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
-msgstr "Es sind keine SMTP privilegierte Netzwerke vorhanden."
-
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
-msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
-
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
-
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr ""
-"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
-"anzulegen."
-
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "POP3 Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "POP3/SSL Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "IMAP Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Sieve Dienst"
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr "FTP Frei/Belegt-Dienst (alt, inkompatibel mit Kolab 2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP Frei/Belegt-Dienst (alt)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Email Scannen (Virus/Spam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Kontingent-Einstellungen"
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Frei/Belegt-Einstellungen"
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-"Erlaube nicht-authentifiziertes Herunterladen von Frei/Belegt-Informationen"
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Intervall für Frei/Belegt-Informationen muß gesetzt sein."
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "SMTP privilegierte Netzwerke"
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr "Intervall für Frei/Belegt-Informationen muß ein positiver Wert sein."
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Rechner/Netzwerke denen Weiterleitung erlaubt ist"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
+msgstr "Der angegebene Kontingent-Wert muß numerisch sein."
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr "Eingabe mehrerer Werte, getrennt durch"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr "Bitte wählen Sie einen Kontingent-Wert zwischen 1 und 100."
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
+msgstr "Frei/Belegt-Intervall muß einen Wert besitzen."
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Aktiviere MX lookup für relayhost"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr "Es sind keine SMTP privilegierte Netzwerke vorhanden."
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Host für Mail Relay"
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
+msgstr "Es ist kein SMTP smarthost/relayhost gesetzt."
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Akzeptiere Internet Mail"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
+msgstr "Dieser 'DN' hat keine Drucker-Erweiterungen."
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "Akzeptiere Mails von anderen Domänen über nicht-authentifiziertes SMTP"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr ""
+"Sie haben keine Berechtigung, einen Drucker unterhalb dieser 'Basis' "
+"anzulegen."
 
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Specific Phone settings"
@@ -5372,114 +5469,24 @@ msgstr "Verbiete diesen Rechnern die Verbindung"
 msgid "MSN"
 msgstr "MSN"
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Name des Systems"
-
-#: plugins/admin/systems/remove.tpl:7
+#: plugins/admin/systems/password.tpl:2
 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."
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
 msgstr ""
-"Dies umfasst <b>alle</b> System- und Setup-Informationen Bitte prüfen Sie "
-"genau, da es keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
-
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Liste der Systeme"
+"Um das Terminal Verwalter-Passwort zu ändern, benutzen Sie die unteren "
+"Felder. Die Veränderungen werden während des nächsten Starts des Terminals "
+"wirksam. Bitte merken Sie sich dieses Passwort, da Sie sonst nicht in der "
+"Lage sein werden, sich am entsprechenden System anzumelden. <b>Lassen Sie "
+"das Feld leer, um das Passwort von den Standard-Einstellungen zu übernehmen."
+"</b>"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
 msgstr ""
-"Mit diesem Menü können Sie Systeme hinzufügen, diese löschen oder die "
-"Eigenschaften bestimmter Systeme verändern. Sie können nur Systeme "
-"hinzufügen, die bereits einmal im Netz gestartet wurden."
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "Wählen um Server anzuzeigen"
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Zeige Server"
-
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Wählen, um Linux Terminals zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Zeige Terminals"
-
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Wählen, um Linux Arbeitsstationen zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Zeige Arbeitsstationen"
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Auswählen um Microsoft Windows Arbeitsstationen zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Zeige Windows basierte Arbeitsstationen"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Wählen, um die 'Netzwerk-Drucker' zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Zeige Netzwerk-Drucker"
-
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Wählen, um 'VoIP-Telefone' zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Zeige Telefone"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Wählen, um Netzwerk-Geräte zu sehen"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Zeige Netzwerk-Geräte"
-
-#: plugins/admin/systems/headpage.tpl:54
-msgid "Regular expression for matching system names"
-msgstr "Regulärer Ausdruck für System-Namen"
-
-#: plugins/admin/systems/headpage.tpl:62
-msgid "Display terminal(s) of user"
-msgstr "Zeige Terminal(s) des Benutzers"
-
-#: plugins/admin/systems/headpage.tpl:65
-msgid "User name of which terminal(s) are shown"
-msgstr "Benutzername, dessen Terminal(s) gezeigt werden"
-
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-msgid "The required field 'MAC-address' is not set."
-msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-msgid "The required field 'IP-address' is not set."
-msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
+"Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
 
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
@@ -5646,24 +5653,15 @@ msgstr "Bilderfassungsdienste bereitstellen"
 msgid "Select scanner driver to use"
 msgstr "Wählen Sie den Scanner-Treiber, der benutzt werden soll"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-"Um das Terminal Verwalter-Passwort zu ändern, benutzen Sie die unteren "
-"Felder. Die Veränderungen werden während des nächsten Starts des Terminals "
-"wirksam. Bitte merken Sie sich dieses Passwort, da Sie sonst nicht in der "
-"Lage sein werden, sich am entsprechenden System anzumelden. <b>Lassen Sie "
-"das Feld leer, um das Passwort von den Standard-Einstellungen zu übernehmen."
-"</b>"
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:276
+msgid "The required field 'MAC-address' is not set."
+msgstr "Das benötigte Feld 'MAC-Adresse' ist nicht gesetzt."
 
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-"Das Ändern des Passwortes wirkt sich nur auf die Authentifizierung aus."
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+msgid "The required field 'IP-address' is not set."
+msgstr "Das benötigte Feld 'IP-Adresse' ist nicht gesetzt."
 
 #: plugins/admin/systems/component.tpl:6
 msgid "Device name"
@@ -5850,21 +5848,89 @@ msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 "Sie haben keine Berechtigung, ein Telefon unterhalb dieser 'Basis' anzulegen."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Arbeitsplätze"
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+"Die gewählten Aktionen beeinflussen <b>alle</b> Systeme in dieser "
+"Objektgruppe. Seien Sie sich bewusst, dass das Neustarten von Systemen, auf "
+"denen gearbeitet wird, nicht gerade Freude verbreitet."
+
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
+msgstr "Wählen Sie die auszuführende Aktion für diese Gruppe von Terminals"
+
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "Mail-Verteilerliste"
+
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr "Primäre Mail-Adresse der Verteilerliste"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Arbeitsplätze"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
+msgstr "Telefon-Gruppe"
+
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or 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 ""
+"Dieses Menü erlaubt es Ihnen Gruppen hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
+"Bereichsauswahl an."
+
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Zeige Gruppen mit Benutzern"
+
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Zeige Gruppen mit Gruppen"
+
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Zeige Gruppen mit Applikationen"
+
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Zeige Gruppen mit Abteilungen"
+
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Zeige Gruppen mit Servern"
+
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Zeige Gruppen mit Arbeitsstationen"
+
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Zeige Gruppen mit Terminals"
+
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Zeige Gruppen mit Druckern"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
-msgstr "Telefon-Gruppe"
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Display object groups matching"
+msgstr "Zeige Objektgruppen auf die Folgendes passt"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "Mail-Verteilerliste"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Name der Gruppe"
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr "Primäre Mail-Adresse der Verteilerliste"
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Zusammengefasste Objekte"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -5934,20 +6000,6 @@ msgstr "Zeige die Objekte auf die Folgendes passt"
 msgid "Regular expression for matching object names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Objekt-Namen"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-"Die gewählten Aktionen beeinflussen <b>alle</b> Systeme in dieser "
-"Objektgruppe. Seien Sie sich bewusst, dass das Neustarten von Systemen, auf "
-"denen gearbeitet wird, nicht gerade Freude verbreitet."
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
-msgstr "Wählen Sie die auszuführende Aktion für diese Gruppe von Terminals"
-
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
@@ -6058,28 +6110,6 @@ msgid "You can combine two different object types at maximum only!"
 msgstr ""
 "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Name der Gruppe"
-
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Zusammengefasste Objekte"
-
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
-msgstr ""
-"Diese Gruppe hat die Mail-Erweiterungen aktiviert. Sie können diese "
-"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
-
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
-msgstr ""
-"Diese Gruppe hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
-"Sie auf die untere Schaltfläche klicken."
-
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -6088,52 +6118,6 @@ msgstr ""
 "Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Chance hat die Daten "
 "wiederherzustellen."
 
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or 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 ""
-"Dieses Menü erlaubt es Ihnen Gruppen hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Gruppen bietet sich die Verwendung der "
-"Bereichsauswahl an."
-
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Zeige Gruppen mit Benutzern"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Zeige Gruppen mit Gruppen"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Zeige Gruppen mit Applikationen"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Zeige Gruppen mit Abteilungen"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Zeige Gruppen mit Servern"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Zeige Gruppen mit Arbeitsstationen"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Zeige Gruppen mit Terminals"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Zeige Gruppen mit Druckern"
-
-#: plugins/admin/ogroups/headpage.tpl:52
-msgid "Display object groups matching"
-msgstr "Zeige Objektgruppen auf die Folgendes passt"
-
 #: plugins/admin/ogroups/phonequeue.tpl:1
 msgid "Queue Settings"
 msgstr "Gruppen-Einstellungen"
@@ -6143,7 +6127,7 @@ msgid "Generic queue setup"
 msgstr "Allgemeine Einstellungen"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:132
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Generic queue Settings"
 msgstr "Allgemeine Gruppen-Einstellungen"
 
@@ -6202,69 +6186,87 @@ msgid "Allows calling to hangup by pressing *"
 msgstr "Auflegen durch Drücken der Taste '*' (Anrufer)"
 
 #: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
+msgstr "Klingelton statt Hintergrund-Musik"
+
+#: plugins/admin/ogroups/phonequeue.tpl:138
 msgid "Queue sound file setup"
 msgstr "Einstellung der Ansagen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:135
+#: plugins/admin/ogroups/phonequeue.tpl:143
 msgid "Use music on hold instead of ringing"
 msgstr "Benutze Wartemusik statt Klingelton"
 
-#: plugins/admin/ogroups/phonequeue.tpl:144
+#: plugins/admin/ogroups/phonequeue.tpl:152
 msgid "Music on hold"
 msgstr "Wartemusik"
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:160
 msgid "Welcome sound file"
 msgstr "'Willkommen'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:168
 msgid "Announce message"
 msgstr "Benachrichtigung"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:176
 msgid "Sound file for 'You are next ...'"
 msgstr "'Sie sind der Nächste...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:184
 msgid "'There are ...'"
 msgstr "'Es gibt ...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:192
 msgid "'... calls waiting'"
 msgstr "'... wartende Anrufe'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:200
 msgid "'Thank you' message"
 msgstr "'Vielen Dank'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:208
 msgid "'minutes' sound file"
 msgstr "'Minuten'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:216
 msgid "'seconds' sound file"
 msgstr "'Sekunden'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:224
 msgid "Hold sound file"
 msgstr "Gespräch halten"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:80
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"Diese Gruppe hat die Mail-Erweiterungen aktiviert. Sie können diese "
+"deaktivieren, indem Sie auf die Schaltfläche unten klicken."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"Diese Gruppe hat keine Mail-Erweiterungen. Sie können diese aktivieren, wenn "
+"Sie auf die untere Schaltfläche klicken."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:83
 msgid "Remove the phone queue from this Account"
 msgstr "Telefon-Gruppe von diesem Konto entfernen"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:81
+#: plugins/admin/ogroups/class_phonequeue.inc:84
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 "Diese Gruppe hat die Telefon-Gruppen-Erweiterungen aktiviert. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 msgid "Create phone queue"
 msgstr "Telefon-Gruppe erstellen"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:83
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
@@ -6272,67 +6274,67 @@ msgstr ""
 "Diese Gruppe hat keine gültigen Telefon-Gruppen-Erweiterungen. Sie können "
 "diese durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:131
+#: plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "Uruguai"
 msgstr "Uruguai"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
+#: plugins/admin/ogroups/class_phonequeue.inc:135
 msgid "No"
 msgstr "Nein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:132
+#: plugins/admin/ogroups/class_phonequeue.inc:135
 msgid "Yes"
 msgstr "Ja"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:133
+#: plugins/admin/ogroups/class_phonequeue.inc:136
 msgid "ring all available channels until one answers"
 msgstr "Rufe auf alle verfügbaren Anschlüsse bis jemand antwortet"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:134
+#: plugins/admin/ogroups/class_phonequeue.inc:137
 msgid "take turns ringing each available interface"
 msgstr "Rufe auf alle verfügbaren Anschlüsse"
 
-#: 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 "Rufe Anschluss, der die wenigsten Anrufe hatte"
 
-#: 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 "Rufe auf Anschluss mit den wenigsten abgeschlossenen Gesprächen"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
+#: plugins/admin/ogroups/class_phonequeue.inc:140
 msgid "ring random interface"
 msgstr "Rufe auf zufälligen Anschluss"
 
-#: 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 "Ring mit Speicher, an welchem Anschluss der Ring verlassen wurde"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:176
+#: plugins/admin/ogroups/class_phonequeue.inc:178
 msgid "Timeout must be numeric"
 msgstr "Der Wert für 'Wartezeit' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:179
+#: plugins/admin/ogroups/class_phonequeue.inc:181
 msgid "Retry must be numeric"
 msgstr "Der Wert für 'Wiederholen' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:182
+#: plugins/admin/ogroups/class_phonequeue.inc:184
 msgid "Max queue length must be numeric"
 msgstr "Der Wert für 'Maximale Grösse der Gruppe' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:185
+#: plugins/admin/ogroups/class_phonequeue.inc:187
 msgid "Announce frequency must be numeric"
 msgstr "Der Wert für 'Benachrichtigungsfrequenz' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:188
+#: plugins/admin/ogroups/class_phonequeue.inc:190
 msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
-#: 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/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:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -6341,30 +6343,76 @@ msgstr ""
 "MySQL-Server '%s' kann nicht als Benutzer '%s' erreicht werden, überprüfen "
 "Sie das GOsa Protokoll auf MySQL-Meldungen."
 
-#: 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/macro/class_gofonMacro.inc:192
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:233
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:933
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "Die Datenbank %s auf %s kann nicht ausgewählt werden."
 
-#: 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
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "Kann nicht entfernen (Datenbank '%s' auf Server '%s')."
 
-#: 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 "Die angegebene Telefonnummer '%s' wird bereits von '%s' verwendet."
 
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Liste der Makros"
+
+#: 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 ""
+"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
+"entfernen. Bei einer Vielzahl von Makros bietet sich die Verwendung der "
+"Bereichsauswahl an."
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Zeige Makros, auf die zutrifft"
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Zeige Makros, auf die zutrifft"
+
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Makro-Name"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "Makro-Name der angezeigt wird"
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Wählen Sie den Unterbaum, in den das Makro eingepflegt werden soll"
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr "Sichtbar für Benutzer"
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Makro-Inhalt"
+
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "Telefon-Makros"
@@ -6468,25 +6516,13 @@ msgstr "Das Makro darf nicht l
 msgid "Please choose a valid  base."
 msgstr "Bitte wählen Sie eine gültige Basis."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Makro-Name"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "Makro-Name der angezeigt wird"
-
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Wählen Sie den Unterbaum, in den das Makro eingepflegt werden soll"
-
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Sichtbar für Benutzer"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Makro-Inhalt"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "Typ"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 msgid "String"
@@ -6512,7 +6548,7 @@ msgstr ""
 "ändern."
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:329
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:805
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
 #, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
@@ -6533,68 +6569,69 @@ msgstr ""
 "Die Parameterzahl des Makros hat sich geändert, sie müssen jeden Benutzer "
 "aktualisieren, der das Makro '%s' benutzt."
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Liste der Makros"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+msgstr "Telefon-Makro-Verwaltung"
 
-#: 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 ""
-"Dieses Menü erlaubt es Ihnen Makros hinzuzufügen, zu bearbeiten oder zu "
-"entfernen. Bei einer Vielzahl von Makros bietet sich die Verwendung der "
-"Bereichsauswahl an."
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Telefonnummern"
 
-#: plugins/gofon/macro/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:41
-msgid "Display macros  matching"
-msgstr "Zeige Makros, auf die zutrifft"
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Anrufe weiterleiten an"
 
-#: plugins/gofon/macro/headpage.tpl:44
-msgid "Regular expression for matching macro names"
-msgstr "Regulärer Ausdruck zum Suchen in Makro-Namen"
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Telefonnummer"
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
-msgstr "Telefon-Makro-Verwaltung"
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Zeitlimit (s)"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
+msgstr "Telefon-Makro"
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "Typ"
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "fill out"
+msgstr "ausfüllen"
+
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
+msgstr "Telefon PIN"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:102
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 msgid "no macro"
 msgstr "kein Makro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
 msgid "undefined"
 msgstr "nicht definiert"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:452
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
 msgid "Error while performing query "
 msgstr "Fehler bei der Ausführung der Anfrage"
 
-#: 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 ""
 "Das gewählte Makro ist nicht mehr verfügbar, bitte wählen Sie ein anderes."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
 msgid "This account has no phone extensions."
 msgstr "Dieses Konto hat keine Telefon-Erweiterungen."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:575
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
 msgid "Remove phone account"
 msgstr "Telefon-Konto entfernen"
 
-#: 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."
@@ -6602,11 +6639,20 @@ msgstr ""
 "Dieses Konto hat die Telefon-Erweiterungen aktiviert. Sie können diese durch "
 "einen Klick auf die untere Schaltfläche deaktivieren."
 
-#: 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 "Telefon-Konto erstellen"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:579
+#: 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 ""
+"Dieses Konto hat keine gültigen Telefon-Erweiterungen. Sie können diese "
+"nicht aktivieren, solange keine gültige UID gesetzt ist."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -6614,86 +6660,63 @@ msgstr ""
 "Dieses Konto hat keine gültigen Telefon-Erweiterungen. Sie können diese "
 "durch einen Klick auf die untere Schaltfläche aktivieren."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:591
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
 msgid "Please enter a valid phone number!"
 msgstr "Bitte geben Sie eine gültige Telefonnummer ein"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
 msgid "Choose your private phone"
 msgstr "Wählen Sie Ihr privates Telefon"
 
-#: 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 "Bitte geben Sie mindestens eine Telefonnummer an!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:774
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
 #, php-format
 msgid "You need to specify a Phone PIN."
 msgstr "Die Eingabe einer Telefon-PIN ist erforderlicht."
 
-#: 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 ""
 "Die gewählte PIN ist ungültig, für diesen Typ dürfen lediglich Ziffern "
 "eingegeben werden."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:779
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
 msgid "The given PIN is too short"
 msgstr "Der gewünschte PIN ist zu kurz"
 
-#: 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 "Die Nummer '%s' ist keine gültige Telefonnummer!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:797
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "Das Zeitlimit '%s' enthält ungültige Zeichen!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:960
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
 msgid "Stop"
 msgstr "Beenden"
 
-#: 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 "Benutzer '%s' von Telefon-Warteschlange '%s' entfernt."
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Telefonnummern"
-
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Anrufe weiterleiten an"
-
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Zeitlimit (s)"
-
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
-msgid "Phone macro"
-msgstr "Telefon-Makro"
-
-#: plugins/gofon/phoneaccount/generic.tpl:77
-msgid "Phone PIN"
-msgstr "Telefon PIN"
-
 #: plugins/gofon/phoneaccount/main.inc:120
 msgid "Phone settings"
 msgstr "Telefon-Einstellungen"
 
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Telefon-Berichte"
+
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Telefon-Berichte"
@@ -6730,10 +6753,6 @@ msgstr "Kanal"
 msgid "Duration"
 msgstr "Dauer"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefon-Berichte"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Thin Client"
@@ -6813,7 +6832,7 @@ msgstr ""
 "Der PHP-Interpreter meldete einen oder mehrere Fehler beim Erzeugen dieser "
 "Seite!"
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr "Zeige/Verstecke Informationen"
 
@@ -7032,18 +7051,23 @@ msgstr "Kann das SIEVE-Skript nicht 
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr "Kann das GOsa SIEVE-Skript nicht aktivieren. Die Meldung war '%s'."
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr "Kann SSHA nicht benutzen (Fehlende Funktion mhash / sha1)"
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Diese 'dn' hat keine Nutzerkonten Erweiterungen."
 
-#: include/class_password-methods.inc:165
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Dies ist ein leeres Modul."
+
+#: 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 ""
-"Das Setzen des Passwortes ist fehlgeschlagen. Die Meldung vom LDAP-Server "
-"war '%s'."
+"Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
 
-#: 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."
@@ -7051,6 +7075,25 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
+"existieren."
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr "Kann SSHA nicht benutzen (Fehlende Funktion mhash / sha1)"
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Das Setzen des Passwortes ist fehlgeschlagen. Die Meldung vom LDAP-Server "
+"war '%s'."
+
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -7618,30 +7661,6 @@ msgstr ""
 "Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
 "Zeile %s!"
 
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Diese 'dn' hat keine Nutzerkonten Erweiterungen."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Dies ist ein leeres Modul."
-
-#: include/class_plugin.inc:398
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
-
-#: include/class_plugin.inc:454
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Das in POSTREMOVE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
-"existieren."
-
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr "Um die Hilfe zu betrachten, müssen Sie angemeldet sein."
@@ -7662,6 +7681,11 @@ msgstr ""
 "Kann keine Hilfe-Dateien unter '%s' finden, wahrscheinlich ist keine Hilfe "
 "verfügbar."
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+"Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Die SQL-Datenbank kann nicht erreicht werden!"
@@ -7674,11 +7698,6 @@ msgstr "Die angegebene Datenbank kann nicht ausgew
 msgid "Database query failed!"
 msgstr "Die Datenbankabfrage ist fehlgeschlagen!"
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-"Fehler: getvcard.php benötigt einen Parameter um eine vcard zu exportieren!"
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7688,6 +7707,32 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden, überprüfen Sie die Existenz und die Rechte!"
 
+#: html/main.php:112
+msgid ""
+"Register globals is on. GOsa will refuse to login unless this is fixed by an "
+"administrator."
+msgstr ""
+"'Register globals' ist im PHP aktiviert. GOsa läßt keine Anmeldung zu, bis "
+"dies von einem Administrator behoben wurde."
+
+#: html/main.php:155
+msgid "Warning: memory is getting low - please increase the memory_limit!"
+msgstr ""
+"Achtung: die Speichernutzung ist zu hoch - bitte erhöhen Sie das "
+"memory_limit!"
+
+#: html/main.php:284
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr "Es kann kein Plugin für die Definition '%s' gefunden werden!"
+
+#: html/main.php:313
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+"Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
+"Seite!"
+
 #: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
@@ -7735,31 +7780,55 @@ msgstr "Die Sitzung ist nicht verschl
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
-#: 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' ist im PHP aktiviert. GOsa läßt keine Anmeldung zu, bis "
-"dies von einem Administrator behoben wurde."
+"Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller "
+"durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der "
+"einfachste Weg große Datenbanken ohne große Zeitüberschreitungen zu "
+"bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen "
+"sinnvollen Wert einzustellen."
 
-#: html/main.php:139
-msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr ""
-"Achtung: die Speichernutzung ist zu hoch - bitte erhöhen Sie das "
-"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 "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
 
-#: html/main.php:263
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
-msgstr "Es kann kein Plugin für die Definition '%s' gefunden werden!"
+#: 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 ""
+"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
 
-#: 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 ""
-"Der W3C-Validator meldete einen oder mehrere Fehler beim Erzeugen dieser "
-"Seite!"
+"Ignoriere diesen Fehler und zeige alle Einträge die innerhalb der "
+"Größenbeschränkung liegen"
+
+#: 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 ""
+"Melden Sie sich bitte mit Ihrem <i>Benutzernamen</i> und Ihrem <i>Passwort</"
+"i> an"
+
+#: 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 "Verzeichnis"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Hier klicken zum Anmelden"
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -7833,56 +7902,6 @@ msgstr ""
 "Benutzernamen und das zugehörige Passwort in das untere Feld ein, um die "
 "fehlenden Einträge zu erstellen."
 
-#: 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 ""
-"Melden Sie sich bitte mit Ihrem <i>Benutzernamen</i> und Ihrem <i>Passwort</"
-"i> an"
-
-#: 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 "Verzeichnis"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Anmelden"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Hier klicken zum Anmelden"
-
-#: 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 ""
-"Die Größenbeschränkung sorgt dafür, daß die LDAP-Operationen schneller "
-"durchgeführt werden können und verringern die Last auf dem LDAP-Server. Der "
-"einfachste Weg große Datenbanken ohne große Zeitüberschreitungen zu "
-"bearbeiten ist es Filter zu verwenden und die Größenbeschränkungen auf einen "
-"sinnvollen Wert einzustellen."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Bitte entscheiden Sie, wie für diese Sitzung verfahren werden soll"
-
-#: 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 ""
-"Ignoriere diesen Fehler und zeige alle vom LDAP-Server gelieferten Einträge"
-
-#: 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 ""
-"Ignoriere diesen Fehler und zeige alle Einträge die innerhalb der "
-"Größenbeschränkung liegen"
-
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -8174,5 +8193,20 @@ msgstr ""
 "Versionen). In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
 "aktivieren (dies kann jedoch ein Sicherheitsrisiko darstellen)."
 
+#~ msgid "Display lists containing"
+#~ msgstr "Zeige Listen die folgendes enthalten"
+
+#~ msgid "Show lists containing entered numbers"
+#~ msgstr "Zeige die Sperrlisten, die die eingegebenen Nummer enthalten"
+
+#~ msgid "Create new system"
+#~ msgstr "Neues System erstellen"
+
+#~ msgid "New system"
+#~ msgstr "Neues System"
+
+#~ msgid "Display terminal(s) of user"
+#~ msgstr "Zeige Terminal(s) des Benutzers"
+
 #~ msgid "Germany"
 #~ msgstr "Deutschland"

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 1798f9f1f3021122618817a541b7a7266ee8d90e..daa70fe108b0a605db13010c47f4ffeb864fa1ef 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -150,9 +150,9 @@ msgid "Export"
 msgstr "Exportar"
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr "Importar"
 
@@ -192,237 +192,185 @@ 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/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Seleccione dirección para añadir"
 
-#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:703
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr "Servidor"
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Filtros"
 
-#: plugins/personal/mail/generic.tpl:13
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostrar las direcciones de los departamentos"
 
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-msgstr "Uso de la Cola de Correo"
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Escoja el departamento base de la busqueda"
 
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:147
-msgid "not defined"
-msgstr "sin definirse"
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr "Tamaño de la Cola de correo"
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Expresiones regulares que concuerden con direcciones"
 
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
-msgid "Alternative addresses"
-msgstr "Direcciones alternativas"
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:175
-#: plugins/admin/systems/phonesettings.tpl:190
-msgid "List of alternative mail addresses"
-msgstr "Lista de direcciones de correo alternativas."
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
 #: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
 #: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
 #: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
 #: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: 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/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95 plugins/admin/ogroups/generic.tpl:38
 #: 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:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
 msgstr "Añadir"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
-#: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:137
-#: plugins/personal/samba/samba3.tpl:289
-#: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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"
+
+#: 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:703
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr "Servidor"
+
+#: plugins/personal/mail/generic.tpl:13
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
+
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+msgid "Quota usage"
+msgstr "Uso de la Cola de Correo"
+
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
+msgid "not defined"
+msgstr "sin definirse"
+
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
+msgid "Alternative addresses"
+msgstr "Direcciones alternativas"
+
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
+msgid "List of alternative mail addresses"
+msgstr "Lista de direcciones de correo alternativas."
+
+#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/posix/generic.tpl:74
+#: plugins/personal/posix/generic.tpl:137
+#: plugins/personal/samba/samba3.tpl:289
+#: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
 #: plugins/gofax/faxaccount/generic.tpl:77
@@ -434,13 +382,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/remove.tpl:15 plugins/admin/systems/startup.tpl:62
-#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/remove.tpl:15
 #: 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/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr "Borrar"
 
@@ -531,9 +479,8 @@ msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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
@@ -543,52 +490,11 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: 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
+#: plugins/gofon/phoneaccount/main.inc:104
 msgid "Finish"
 msgstr "Terminar"
 
-#: 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 "Cancelar"
-
 #: 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
@@ -612,78 +518,160 @@ msgstr "Editar"
 msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Seleccione dirección para añadir"
+#: 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/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtros"
+#: 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/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostrar las direcciones de los departamentos"
+#: 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/mail_locals.tpl:27
-#: 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
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la busqueda"
+#: 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/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Mostrar direcciones que concuerden con"
+#: 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/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-msgstr "Expresiones regulares que concuerden con direcciones"
+#: 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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-msgstr "Mostrar direcciones del usuario"
+#: 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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-msgstr "Nombre de usuario de las direcciones mostradas"
+#: 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/password/class_password.inc:5
-#: 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 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/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/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/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
@@ -746,11 +734,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -762,6 +750,18 @@ msgstr ""
 msgid "Back"
 msgstr "Atras"
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "Contraseña"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -802,18 +802,64 @@ 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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr "Directorio Principal"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostrar sistemas de departamentos"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: 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/generic.tpl:21
+msgid "Primary group"
+msgstr "Grupo primario"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Estado"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Forzar UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Miembros del grupo"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Cuenta"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Entorno"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Impresora por defecto"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Lenguaje por defecto"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "Autentificación del sistema"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -904,64 +950,18 @@ msgstr ""
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
-#: 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
-msgid "Home directory"
-msgstr "Directorio Principal"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Estado"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Forzar UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Miembros del grupo"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Cuenta"
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Entorno"
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr "Impresora por defecto"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione sistema a añadir"
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "Lenguaje por defecto"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostrar sistemas de departamentos"
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "Autentificación del sistema"
+#: 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/main.inc:131
 msgid "Unix settings"
@@ -1665,16 +1665,6 @@ msgstr ""
 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"
@@ -1691,8 +1681,8 @@ 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/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nombre"
@@ -1736,9 +1726,9 @@ msgstr "Sexo"
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1907,6 +1897,16 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
+#: 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_picture.tpl:23
 msgid "Remove picture"
 msgstr "Eliminar foto"
@@ -1916,6 +1916,14 @@ msgstr "Eliminar foto"
 msgid "Save"
 msgstr "Guardar"
 
+#: 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/main.inc:187
+msgid "Generic user information"
+msgstr "Información genérica del usuario"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -1943,42 +1951,10 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: 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/main.inc:187
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
-
-#: 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/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
+#: plugins/personal/connectivity/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Crear cuenta telefónica"
 
 #: plugins/personal/connectivity/proxy.tpl:16
 msgid "Proxy account"
@@ -2000,78 +1976,63 @@ msgstr "Restringir el uso del proxy con cuota"
 msgid "per"
 msgstr "por"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr "Kolab"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "Cuenta FTP"
 
-#: 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/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr "Ancho de banda"
 
-#: 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/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Ancho de banda ascendente"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr "Aceptar siempre"
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "Kb/s"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr "Denegar siempre"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Ancho de banda descendente"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr "Denegar si hay conflictos"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
+msgstr "Cuota"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr "Preguntar si hay conflictos"
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "Archivos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Manual"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Tamaño"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anónimo"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr "Relación"
 
-#: 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/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "Archivos Subidos / Descargados"
 
-#: 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/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Active para desactivar acceso FTP"
 
-#: 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/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Acceso FTP desactivado temporalmente"
 
-#: 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/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "Cuenta PHPGroupware"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "Cuenta PHPGroupware"
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Cuenta Kolab"
@@ -2118,100 +2079,6 @@ 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"
-
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Ancho de banda"
-
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Ancho de banda ascendente"
-
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "Kb/s"
-
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Ancho de banda descendente"
-
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Cuota"
-
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "Archivos"
-
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
-msgstr "Tamaño"
-
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Relación"
-
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "Archivos Subidos / Descargados"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Active para desactivar acceso FTP"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Acceso FTP desactivado temporalmente"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Cuenta Open-Xchange"
@@ -2244,15 +2111,6 @@ 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"
@@ -2291,27 +2149,218 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
+
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Nombre de la lista"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nombre de la lista de bloqueos"
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr "Kolab"
 
-#: 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: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: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: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/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr "Aceptar siempre"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr "Denegar siempre"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr "Denegar si hay conflictos"
+
+#: 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/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/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "Esta cuenta no tiene extensiones de conectividad"
+
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Lista de listas de bloqueos"
+
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Este menú le permite crear, editar o eliminar listas de bloqueo. Puede usar "
+"el selector de rango en la parte superior de la lista, cuando trabaja con un "
+"gran número de listas de bloqueo."
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo salientes"
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr "Mostrar listas de bloqueos salientes"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo entrantes"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr "Mostrar listas de bloqueos entrantes"
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr "Mostrar listas que contengan"
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr "Expresiones regulares para encontrar nombres de listas"
+
+#: 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"
@@ -2337,17 +2386,6 @@ msgstr "Descripción de esta lista de bloqueos"
 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"
@@ -2603,44 +2641,6 @@ msgstr ""
 "Entonces si esta seguro - presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Lista de listas de bloqueos"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"Este menú le permite crear, editar o eliminar listas de bloqueo. Puede usar "
-"el selector de rango en la parte superior de la lista, cuando trabaja con un "
-"gran número de listas de bloqueo."
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo salientes"
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Mostrar listas de bloqueos salientes"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo entrantes"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Mostrar listas de bloqueos entrantes"
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Mostrar listas que contengan"
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Expresiones regulares para encontrar nombres de listas"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Gestión de listas de bloqueo"
@@ -2747,8 +2747,8 @@ msgid "List of predefined blocklists"
 msgstr "Listas de listas de bloqueos predefinidas"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2819,65 +2819,16 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr "Previsualización del Fax - Por favor espere"
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
+msgstr "Filtro"
 
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr "Pulse en 'Fax' para descargar"
-
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr "Usuario"
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr "Fecha / Hora"
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr "MSN del Remitente"
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr "ID del Remitente"
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr "MSN del Receptor"
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr "ID del Receptor"
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr "Estado del mensaje"
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr "Tiempo de envio"
-
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr "# páginas"
-
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
-msgstr "Filtro"
-
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
-msgstr "Buscar por"
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
+msgstr "Buscar por"
 
 #: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
 msgid "Enter user name to search for"
@@ -2902,6 +2853,11 @@ msgstr "durante"
 msgid "Search"
 msgstr "Buscar"
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr "Usuario"
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2916,12 +2872,60 @@ msgstr "Remitente"
 msgid "Receiver"
 msgstr "Receptor"
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr "# páginas"
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr "Previsualización del Fax - Por favor espere"
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr "Pulse en 'Fax' para descargar"
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr "FAX ID"
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr "Fecha / Hora"
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr "MSN del Remitente"
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr "ID del Remitente"
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr "MSN del Receptor"
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr "ID del Receptor"
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr "Estado del mensaje"
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr "Tiempo de envio"
+
+#: 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"
@@ -2956,10 +2960,6 @@ msgstr ""
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Reportes de FAX"
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -3036,6 +3036,16 @@ msgstr "Marcando conexión"
 msgid "Dial"
 msgstr "Llamar"
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Esto incluye toda la información de la libreta de direcciones en esta "
+"entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
+"hay forma de que GOsa recupere la información."
+
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr "Elija un departamento para guardar la entrada"
@@ -3075,16 +3085,6 @@ msgstr "Ciudad"
 msgid "Country"
 msgstr "Pais"
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"Esto incluye toda la información de la libreta de direcciones en esta "
-"entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
-"hay forma de que GOsa recupere la información."
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Libreta de direcciones"
@@ -3179,6 +3179,53 @@ msgstr ""
 "No tiene permisos para crear o modificar una entrada de libreta de "
 "direcciones global."
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+"La extensión importar desde CSV provee de los metodos para generar cuentas "
+"desde un archivo que contiene valores separados por comas. El administrador "
+"puede decidir cuales columnas debería ser transferidas a que atributo. "
+"Fíjese que al menos debe tener 'UID', 'GIVENNAME' y 'SURENAME' configurados."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr "Seleccione el archivo CSV para importar"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr "Visualizar"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr "Selecciona plantilla"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr "Error: Ha habido un error durante la importación de los datos."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr "Este es el informe de estado de la importación:"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr "Plantilla seleccionada"
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr "Gestor LDAP"
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3248,11 +3295,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr "Importar archivo LDIF"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr "Visualizar"
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr "Modificar los atributos existentes"
@@ -3265,43 +3307,6 @@ msgstr "Sobreescribir la entrada actual"
 msgid "Import successful"
 msgstr "Importación correcta"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-"La extensión importar desde CSV provee de los metodos para generar cuentas "
-"desde un archivo que contiene valores separados por comas. El administrador "
-"puede decidir cuales columnas debería ser transferidas a que atributo. "
-"Fíjese que al menos debe tener 'UID', 'GIVENNAME' y 'SURENAME' configurados."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr "Seleccione el archivo CSV para importar"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr "Selecciona plantilla"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr "Error: Ha habido un error durante la importación de los datos."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr "Este es el informe de estado de la importación:"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr "Plantilla seleccionada"
-
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr "No tiene permisos para hacer importaciones LDAP"
@@ -3349,11 +3354,6 @@ msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
 msgid "Click here to save the LDAP Export "
 msgstr "Pulse aquí para exportar la base de datos LDAP"
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr "Gestor LDAP"
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr "Importar desde CSV"
@@ -3366,6 +3366,42 @@ msgstr "No tiene permisos para hacer exportaciones LDAP."
 msgid "Error while exporting the requested entries!"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr "Mostrar equipos"
+
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr "Nivel de log"
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr "Intervalo de tiempo"
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr "Introducir la cadena de busqueda"
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr "Paquete de reglas"
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr "Nivel"
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr "Nombre de Maquina"
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr "Mensaje"
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr "Ver registro del sistema"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Registro del sistema"
@@ -3425,90 +3461,19 @@ msgstr ""
 "No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
 "registros!"
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Mostrar equipos"
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Nivel de log"
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Intervalo de tiempo"
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Introducir la cadena de busqueda"
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Paquete de reglas"
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Nivel"
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Nombre de Maquina"
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Mensaje"
-
-#: plugins/addons/logview/main.inc:23
-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/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista de grupos"
 
-#: plugins/admin/groups/class_groupGeneric.inc:591
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"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 ""
-"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."
+"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/mail.tpl:11
 msgid "Primary mail address for this shared folder"
@@ -3534,19 +3499,13 @@ 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
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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 ""
-"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."
+"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"
@@ -3627,17 +3586,78 @@ msgstr "Propiedades"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: 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 ""
-"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."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 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."
+"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
+"numeros y guiones."
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
+#: 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/application.tpl:4
+msgid "Used applications"
+msgstr "Aplicaciones Usadas"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Editar parametros"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Editar parámetros de aplicaciones opcionales"
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr "Aplicaciones disponibles"
+
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Objeto"
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3687,55 +3707,9 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Objeto"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Aplicaciones Usadas"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Editar parametros"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Editar parámetros de aplicaciones opcionales"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Aplicaciones disponibles"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Seleccione usuarios que serán añadidos"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr "Mostrar usuarios del departamento"
-
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-msgid "Display users matching"
-msgstr "Mostrar usuarios que concuerden con"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr "Este 'dn' no es un contenedor de listas de acceso."
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr "Todos los campos son rellenarles."
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Administradores de Carpetas"
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -3783,23 +3757,49 @@ msgstr "Miembros están en un grupo de salto telefónico"
 msgid "Group members"
 msgstr "Miembros del grupo"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Administradores de Carpetas"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/groups/class_groupApplication.inc:61
-msgid "This 'dn' is no appgroup."
-msgstr "Esta'dn' no es un grupo de aplicaciones."
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr "Mostrar usuarios del departamento"
 
-#: plugins/admin/groups/class_groupApplication.inc:69
-msgid "Remove applications"
-msgstr "Borrar aplicaciones"
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+msgid "Display users matching"
+msgstr "Mostrar usuarios que concuerden con"
 
-#: plugins/admin/groups/class_groupApplication.inc:70
-msgid ""
-"This group has application features enabled. You can disable them by "
-"clicking below."
-msgstr ""
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr "Este 'dn' no es un contenedor de listas de acceso."
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+msgstr "Todos los campos son rellenarles."
+
+#: 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."
+
+#: plugins/admin/groups/class_groupApplication.inc:69
+msgid "Remove applications"
+msgstr "Borrar aplicaciones"
+
+#: plugins/admin/groups/class_groupApplication.inc:70
+msgid ""
+"This group has application features enabled. You can disable them by "
+"clicking below."
+msgstr ""
 "Este grupo tiene la características de aplicación activa. Puede "
 "desactivarlas apretando a continuación."
 
@@ -3830,6 +3830,79 @@ msgstr "La aplicación seleccionada no tiene opciones."
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/users/headpage.tpl:24
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
+"seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
+"selectores de rangos en la parte superior del listado."
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr "Mostrar plantillas"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr "Seleccione para ver los usuarios que solo tienen un objeto GOsa"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Mostrar usuarios funcionales"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr "Seleccione para ver usuario que tienen configuraciones posix"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr "Mostrar los usuarios unix"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr "Seleccione para ver los usuarios que tiene confiraciones de correo"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Mostrar los usuarios de correo"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr "Seleccione para ver los usuarios que tiene configuraciones samba"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Mostrar usuarios samba"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Mostrar los usuarios de proxy"
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
+"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
+"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
+"posteriormente la información."
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -3840,42 +3913,6 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
-
-#: 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"
@@ -3932,8 +3969,8 @@ msgstr "Contraseña"
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: 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
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Nombre de Usuario"
 
@@ -3995,78 +4032,64 @@ msgstr "en linea"
 msgid "Offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
-"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
-"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Plantilla"
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "Lista de usuarios"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/users/template.tpl:6
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+"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 ""
-"Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
-"seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
-"selectores de rangos en la parte superior del listado."
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr "Mostrar plantillas"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr "Seleccione para ver los usuarios que solo tienen un objeto GOsa"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Mostrar usuarios funcionales"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Seleccione para ver usuario que tienen configuraciones posix"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Mostrar los usuarios unix"
+"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/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Seleccione para ver los usuarios que tiene confiraciones de correo"
+#: 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/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Mostrar los usuarios de correo"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administración de Usuarios"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Seleccione para ver los usuarios que tiene configuraciones samba"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Lista de aplicaciones"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Mostrar usuarios samba"
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las aplicaciones seleccionadas. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"aplicaciones, cuando trabaja con un gran número de aplicaciones."
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
+msgstr "Mostrar aplicaciones que concuerden con"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Mostrar los usuarios de proxy"
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
+msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -4075,7 +4098,7 @@ msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -4172,34 +4195,35 @@ msgstr ""
 "realmente hacer esto, ya que no hay manera de que GOsa recupere "
 "posteriormente la información."
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lista de aplicaciones"
-
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
-msgstr ""
-"Este menú permite añadir, editar o eliminar las aplicaciones seleccionadas. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"aplicaciones, cuando trabaja con un gran número de aplicaciones."
-
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
-msgstr "Mostrar aplicaciones que concuerden con"
-
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
-msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
-
 #: plugins/admin/applications/main.inc:38
 #: plugins/admin/applications/main.inc:40
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:63
+msgid "This 'dn' is no application."
+msgstr "Este 'dn' no es una aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:159
+msgid "The specified picture has not been uploaded correctly."
+msgstr "La foto indicada no ha sido subida correctamente."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:240
+msgid "You have no permissions to create a application on this 'Base'."
+msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:245
+msgid "Required field 'Name' is not filled."
+msgstr "El campo requerido 'Nombre' no ha sido llenado."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:248
+msgid "Required field 'Execute' is not filled."
+msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:257
+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'."
@@ -4221,29 +4245,27 @@ msgstr "Nuevo"
 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"
-
-#: plugins/admin/applications/class_applicationGeneric.inc:159
-msgid "The specified picture has not been uploaded correctly."
-msgstr "La foto indicada no ha sido subida correctamente."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:240
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:245
-msgid "Required field 'Name' is not filled."
-msgstr "El campo requerido 'Nombre' no ha sido llenado."
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"departamentos, cuando trabaja con un gran número de departamentos."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:248
-msgid "Required field 'Execute' is not filled."
-msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:257
-msgid "There's already an application with this 'Name'."
-msgstr "Ya existe una aplicación con este 'Nombre'."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
+msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -4309,31 +4331,30 @@ msgstr ""
 "actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
 "presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Lista de Departamentos"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
+msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"departamentos, cuando trabaja con un gran número 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/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+#: 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/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "Expresiones regulares para encontrar nombres de departamentos"
+#: 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/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
-msgstr "Mantenimiento de Departamentos"
+#: 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
@@ -4378,26 +4399,17 @@ 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/systems/network.tpl:1
+msgid "Network settings"
+msgstr "Configuración de red"
 
-#: 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/systems/network.tpl:8
+msgid "IP-address"
+msgstr "Dirección IP"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr "Por favor elija otro nombre."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr "Dirección MAC"
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
@@ -4436,48 +4448,37 @@ msgstr "estado desconocido"
 msgid "offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Configuración de red"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "Exportación NFS"
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
-msgstr "Dirección IP"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr "Dirección MAC"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr "Esta 'dn' no tiene características de red."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-#, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "No tiene permisos para crear un componente en esta 'Base'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Ya hay una entrada '%s' en la base elegida"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Servicio de impresión"
 
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
@@ -4575,41 +4576,116 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr "Esta 'dn' no tiene características de red."
+
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "No tiene permisos para crear un componente en esta 'Base'."
+
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Ya hay una entrada '%s' en la base elegida"
+
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "Exportación NFS"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Elija un subárbol donde colocar el terminal"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor 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/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Servidor Raíz"
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
+#: 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/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: 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:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Acción"
+
+#: 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_terminalService.inc:83
 msgid "default"
@@ -4649,47 +4725,10 @@ 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/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/server.tpl:6
 msgid "Server name"
 msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Elija un subárbol donde colocar el terminal"
-
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Acción"
-
 #: plugins/admin/systems/server.tpl:42
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
@@ -4698,71 +4737,29 @@ msgstr "Seleccione una acción que se ejecutara en este servidor"
 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"
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
 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/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
 
-#: 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/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Servidor NTP"
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
+msgstr "Nombre de la impresora"
 
-#: 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/printer.tpl:32
+msgid "Printer URL"
+msgstr "URL de la impresora"
 
-#: 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/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Ruta al 'PPD'"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
@@ -4877,18 +4874,6 @@ 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."
@@ -5080,53 +5065,116 @@ msgstr "Plantilla de terminal"
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: 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/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "Servicio POP3"
 
-#: 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:22
+msgid "POP3/SSL service"
+msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/class_servDNS.inc:33
-msgid "Remove DNS service"
-msgstr "Eliminar servicio DNS"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/class_servDNS.inc:34
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
-"aquí."
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "Servicio IMAP/SSL"
 
-#: plugins/admin/systems/class_servDNS.inc:36
-msgid "Add DNS service"
-msgstr "Añadir servicio DNS"
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/class_servDNS.inc:37
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
-"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
+"de presencia de Kolab2)"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Acceso a Kerberos kadmin"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Dominio Kerberos"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Parámetros de Presencia"
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Permite descarga no autentificada de información de presencia."
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "Redes privilegiadas SMTP"
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhos"
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Permitir búsquedas MX para los relayhost"
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Equipo usado para reenviar correos"
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Aceptar correo desde internet"
+
+#: plugins/admin/systems/servkolab.tpl:169
+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/class_servDNS.inc:33
+msgid "Remove DNS service"
+msgstr "Eliminar servicio DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:34
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_servDNS.inc:36
+msgid "Add DNS service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:37
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
+msgstr ""
+"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Acceso a Kerberos kadmin"
+
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Dominio Kerberos"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 msgid "Admin user"
 msgstr "Usuario administrador"
 
@@ -5178,164 +5226,32 @@ msgstr "Base de datos de Logs"
 msgid "Logging DB user"
 msgstr "Base de datos de acceso de usuarios"
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid "Remove Kolab extension"
-msgstr "Eliminar extensión Kolab"
-
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Add Kolab service"
-msgstr "Añadir el servicio Kolab"
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: 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 "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-"Incluye información desde hace '%s' días cuando cree listas de presencia"
+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_servKolab.inc:149
+#: plugins/admin/systems/class_servDB.inc:137
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
-"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
-
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Se deben poner días futuros en la configuración de presencia"
-
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-"Días futuros en la configuración de presencia debe ser un número positivo."
-
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
-msgstr "El valor introducido como cuota debe ser un número."
-
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
-"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
-
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
-msgstr "Días futuros debe ser un valor"
-
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
-msgstr "No se han indicado redes privilegiadas SMTP."
-
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
-msgstr "No se ha indicado SMTP smarthost/relayhost"
-
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "Servicio POP3"
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "Servicio POP3/SSL"
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "Servicio IMAP"
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "Servicio IMAP/SSL"
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Servicio Sieve"
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
-"de presencia de Kolab2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servicio de presencia HTTP (propio)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Desinfectado de correo Amavis (virus/spam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Parámetros de quotas"
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Parámetros de Presencia"
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "Permite descarga no autentificada de información de presencia."
-
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "Redes privilegiadas SMTP"
-
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
-
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhos"
-
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Permitir búsquedas MX para los relayhost"
-
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Equipo usado para reenviar correos"
-
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Aceptar correo desde internet"
-
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr ""
-"Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
+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/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nombre de la maquina"
+#: 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/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 ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la informació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/headpage.tpl:6
 msgid "List of systems"
@@ -5423,9 +5339,197 @@ msgstr "Mostrar direcciones del usuario"
 msgid "User name of which terminal(s) are shown"
 msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
 
-#: plugins/admin/systems/service.tpl:4
-msgid "Keyboard"
-msgstr "Teclado"
+#: 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 ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
+
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
+msgstr "Eliminar extensión Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+"Incluye información desde hace '%s' días cuando cree listas de presencia"
+
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
+
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Se deben poner días futuros en la configuración de presencia"
+
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+"Días futuros en la configuración de presencia debe ser un número positivo."
+
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
+msgstr "El valor introducido como cuota debe ser un número."
+
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
+"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
+
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
+msgstr "Días futuros debe ser un valor"
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr "No se han indicado redes privilegiadas SMTP."
+
+#: plugins/admin/systems/class_servKolab.inc:239
+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/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/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+"Para cambiarla clave de administrador ('root') del terminal use los campos "
+"mas abajo. Los cambios tendrán efecto durante el próximo inicio. Por favor "
+"memorice la nueva clave, ya que deberá iniciar sesion. <b> Dejando los "
+"campos en blanco se pondrán los valores por defecto.</b>"
+
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
+msgstr "Cambiar la contraseña afecta solamente a la autenticación."
+
+#: plugins/admin/systems/service.tpl:4
+msgid "Keyboard"
+msgstr "Teclado"
 
 #: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
 msgid "Model"
@@ -5590,22 +5694,6 @@ msgstr "Provee servicios de exploración"
 msgid "Select scanner driver to use"
 msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-"Para cambiarla clave de administrador ('root') del terminal use los campos "
-"mas abajo. Los cambios tendrán efecto durante el próximo inicio. Por favor "
-"memorice la nueva clave, ya que deberá iniciar sesion. <b> Dejando los "
-"campos en blanco se pondrán los valores por defecto.</b>"
-
-#: plugins/admin/systems/password.tpl:6
-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
@@ -5803,102 +5891,92 @@ 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/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/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+"Todas las acciones que elija aquí influirán en <b>todas</b> la máquinas en "
+"este objeto grupo. Tenga presente que reiniciar las máquinas pueden no hacer "
+"felices a las personas que actualmente están trabajando en ellas."
 
-#: 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/ogroups/termgroup.tpl:7
+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/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 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
+#: plugins/admin/ogroups/mail.tpl:11
 #, fuzzy
-msgid "Default IP"
-msgstr "por defecto"
+msgid "Primary mail address for this distribution list"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
-#: plugins/admin/systems/phonesettings.tpl:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr ""
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminales"
 
-#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
 #, fuzzy
-msgid "Modus"
-msgstr "Ratón"
+msgid "Phone queue"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or 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ú le 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/systems/phonesettings.tpl:121
-#, fuzzy
-msgid "Secret"
-msgstr "Calle"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Mostrar grupos que tienen usuarios"
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Mostrar grupos que contienen grupos"
 
-#: plugins/admin/systems/phonesettings.tpl:150
-#, fuzzy
-msgid "Account code"
-msgstr "Cuenta"
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Mostrar grupos que contienen aplicaciones"
 
-#: plugins/admin/systems/phonesettings.tpl:158
-#, fuzzy
-msgid "Trunk lines"
-msgstr "Clientes Ligeros"
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Mostrar grupos que contienen departamentos"
 
-#: 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/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Mostrar grupos que contienen servidores"
 
-#: 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/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Mostrar grupos que contienen estaciones de trabajo"
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Mostrar grupos que contienen terminales"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminales"
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Mostrar grupos que contienen impresoras"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
-msgid "Phone queue"
-msgstr "Número de teléfono"
+msgid "Display object groups matching"
+msgstr "Mostrar objetos que concuerden con"
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Objetos miembro"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -5968,82 +6046,8 @@ msgstr "Mostrar objetos que concuerden con"
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares que concuerden con nombres de objetos"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-"Todas las acciones que elija aquí influirán en <b>todas</b> la máquinas en "
-"este objeto grupo. Tenga presente que reiniciar las máquinas pueden no hacer "
-"felices a las personas que actualmente están trabajando en ellas."
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-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_ogroup.inc:95
-msgid "This 'dn' is no object group."
-msgstr "Este 'dn' no es un objeto tipo grupo."
-
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "too many different objects!"
-msgstr "¡Demasiados objetos diferentes!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "users"
-msgstr "usuarios"
-
-#: plugins/admin/ogroups/class_ogroup.inc:206
-msgid "groups"
-msgstr "grupos"
-
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "applications"
-msgstr "Aplicaciones"
-
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "departments"
-msgstr "departamentos"
-
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "servers"
-msgstr "servidores"
-
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "workstations"
-msgstr "estaciones de trabajo"
-
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "terminals"
-msgstr "terminales"
-
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "phones"
-msgstr "teléfonos"
-
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "printers"
-msgstr "servidores de Impresión"
-
-#: plugins/admin/ogroups/class_ogroup.inc:220
-msgid "and"
-msgstr "y"
-
-#: plugins/admin/ogroups/class_ogroup.inc:371
-msgid "Non existing dn: "
-msgstr "No existe 'dn':"
-
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr "'Grupos de objetos que necesitan al menos un miembro!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:507
-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
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
@@ -6093,213 +6097,73 @@ msgstr "Grupo de objetos"
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Objetos miembro"
-
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
-"GOsa pueda recuperar posteriormente esa información"
-
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or 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ú le 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/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Mostrar grupos que tienen usuarios"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Mostrar grupos que contienen grupos"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Mostrar grupos que contienen aplicaciones"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Mostrar grupos que contienen departamentos"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Mostrar grupos que contienen servidores"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Mostrar grupos que contienen estaciones de trabajo"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Mostrar grupos que contienen terminales"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Mostrar grupos que contienen impresoras"
-
-#: plugins/admin/ogroups/headpage.tpl:51
-#, fuzzy
-msgid "Display object groups matching"
-msgstr "Mostrar objetos que concuerden con"
-
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr ""
-
-#: plugins/admin/ogroups/mail.tpl:11
-#, fuzzy
-msgid "Primary mail address for this distribution list"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
-
-#: 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/class_phonequeue.inc:83
-#, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "Eliminar cuenta telefónica"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-#, 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: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/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 "Sistemas"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:95
+msgid "This 'dn' is no object group."
+msgstr "Este 'dn' no es un objeto tipo grupo."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "too many different objects!"
+msgstr "¡Demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:206
+msgid "groups"
+msgstr "grupos"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "applications"
+msgstr "Aplicaciones"
 
-#: 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_ogroup.inc:208
+msgid "departments"
+msgstr "departamentos"
 
-#: 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_ogroup.inc:209
+msgid "servers"
+msgstr "servidores"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:210
+msgid "workstations"
+msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
-msgid "Max queue length must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "terminals"
+msgstr "terminales"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:212
+msgid "phones"
+msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
-msgid "There must be least one queue number defined."
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "printers"
+msgstr "servidores de Impresión"
 
-#: 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_ogroup.inc:220
+msgid "and"
+msgstr "y"
 
-#: 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 "No puedo seleccionar la base de datos."
+#: plugins/admin/ogroups/class_ogroup.inc:371
+msgid "Non existing dn: "
+msgstr "No existe 'dn':"
 
-#: 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_ogroup.inc:502
+msgid "Object groups need at least one member!"
+msgstr "'Grupos de objetos que necesitan al menos un miembro!"
 
-#: 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'."
+#: plugins/admin/ogroups/class_ogroup.inc:507
+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/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
+"Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
+"GOsa pueda recuperar posteriormente esa información"
 
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
@@ -6429,195 +6293,241 @@ msgstr ""
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Configuración telefónica"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
-#, fuzzy
-msgid "no macro"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 #, fuzzy
-msgid "undefined"
-msgstr "sin definirse"
+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/gofon/phoneaccount/class_phoneAccount.inc:468
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 #, fuzzy
-msgid "Error while performing query "
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
-
-#: 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."
+"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/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:620
-msgid "Remove phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "Remove the phone queue from this Account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+#, fuzzy
 msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+"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/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
-msgid "Create phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid "Create phone queue"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
 msgid ""
-"This account has phone features disabled. You can't enable them while no uid "
-"is set."
+"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/gofon/phoneaccount/class_phoneAccount.inc:628
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
-"Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
-"pulsando aquí."
 
-#: 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/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
-msgid "Choose your private phone"
-msgstr "Indique su teléfono particular"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+#, fuzzy
+msgid "Yes"
+msgstr "Sistemas"
 
-#: 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/admin/ogroups/class_phonequeue.inc:136
+msgid "ring all available channels until one answers"
+msgstr ""
 
-#: 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/admin/ogroups/class_phonequeue.inc:137
+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."
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+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"
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+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 "¡El número '%s' no es un número de teléfono valido!"
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#: 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 "El puerto sieve necesita ser un numero."
+
+#: 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/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
 #, 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!"
+msgid "Can't select database %s on %s."
+msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
-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 "No puedo seleccionar la base de datos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#: 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 "Removed user '%s' from phone queue '%s'."
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Números de teléfonos"
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista de grupos"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Reenviar llamadas a"
+#: 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/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Número de teléfono"
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Tiempo(s) excedido(s)"
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Phone macro"
-msgstr "Informes telefónicos"
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
-msgid "fill out"
-msgstr "Salir"
+msgid "Macro name"
+msgstr "Nombre de la maquina"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
 #, fuzzy
-msgid "Phone PIN"
-msgstr "Teléfono"
+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/reports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la base de datos telefónica, ¡No se pueden mostrar "
-"informes!"
+#: 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/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos telefónica para la generación de "
-"informes!"
+#: 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/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Fuente"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Variable"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Destino"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Nombre de la maquina"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Duración"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Visible Publicamente"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Informes telefónicos"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Visible Publicamente"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6679,155 +6589,245 @@ msgstr ""
 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
+#: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
-msgid "Macro name"
-msgstr "Nombre de la maquina"
+msgid "Argument"
+msgstr "Argumentos"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr ""
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
 
-#: plugins/gofon/macro/generic.tpl:22
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
+msgid "String"
+msgstr "durante"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: 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 "Visible for user"
-msgstr "Lista de usuarios"
+msgid "Delete unused"
+msgstr "Borrar"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: 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:855
+#, 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/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/main.inc:38 plugins/gofon/macro/main.inc:40
 #, fuzzy
-msgid "Macro text"
-msgstr "Nombre de la maquina"
+msgid "Phone macro management"
+msgstr "Gestión del sistema"
 
-#: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Números de teléfonos"
+
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Reenviar llamadas a"
+
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Tiempo(s) excedido(s)"
+
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
 #, fuzzy
-msgid "List of macros"
-msgstr "Lista de grupos"
+msgid "Phone macro"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/headpage.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:67
 #, 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."
+msgid "fill out"
+msgstr "Salir"
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/phoneaccount/generic.tpl:78
 #, fuzzy
-msgid "Display macros matching"
-msgstr "Mostrar grupos que concuerden con"
+msgid "Phone PIN"
+msgstr "Teléfono"
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
-msgid "Display macros  matching"
-msgstr "Mostrar grupos que concuerden con"
+msgid "no macro"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
 #, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Expresión regular que concuerde con nombres de grupos"
+msgid "undefined"
+msgstr "sin definirse"
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
 #, fuzzy
-msgid "Phone macro management"
-msgstr "Gestión del sistema"
+msgid "Error while performing query "
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: 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:610
+msgid "This account has no phone extensions."
+msgstr "Esta cuenta no tiene extensiones telefónicas"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
+msgstr "Eliminar cuenta telefónica"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+msgid ""
+"This account has phone features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
+"pulsando aquí."
+
+#: 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:625
 #, fuzzy
-msgid "String"
-msgstr "durante"
+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/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
+"pulsando aquí."
+
+#: 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:679
+msgid "Choose your private phone"
+msgstr "Indique su teléfono particular"
+
+#: 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: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:827
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#, php-format
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-#, fuzzy
-msgid "Delete unused"
-msgstr "Borrar"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
+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/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, php-format
-msgid "The parameter %s has incorrect value for type bool."
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
+msgid "Removed user '%s' from phone queue '%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/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Configuración telefónica"
 
-#: 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/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Crear cuenta telefónica"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "Variable"
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la base de datos telefónica, ¡No se pueden mostrar "
+"informes!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
+"¡No puedo seleccionar la base de datos telefónica para la generación de "
+"informes!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Nombre de la maquina"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Visible Publicamente"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Fuente"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Visible Publicamente"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Destino"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argumentos"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
 
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Duración"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6873,13 +6873,38 @@ 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 ""
 "¡La generación de esta página provoca que el interprete PHP muestre algunos "
 "errores!"
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -7100,175 +7125,73 @@ msgstr ""
 "No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
 "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 ""
-"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
-"favor actualízela usando el 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 ""
-"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 ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
-
-#: 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 ""
-"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."
-msgstr ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
-
-#: 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/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 ""
-"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_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Esta es un extensión vacía."
 
-#: include/class_ldap.inc:700
+#: include/class_plugin.inc:398
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
+#: 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 ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
 
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
+#: 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_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: 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_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
+#: 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_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"
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
+"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
+"pueden cambiar las contraseñas de SAMBA."
 
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %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 ""
+"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
+"favor actualízela usando el script 'fix_config.sh'!"
 
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
+#: 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/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7738,6 +7661,83 @@ msgid ""
 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"
+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!"
+
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr ""
@@ -7757,6 +7757,10 @@ msgid ""
 "Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr "Error: getcvard.php necesita un parametro para exportar a vcard."
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "No puedo conectar al servidor de base de datos."
@@ -7769,10 +7773,6 @@ msgstr "No puedo seleccionar la base de datos."
 msgid "Database query failed!"
 msgstr "La consulta a la base de datos ha fallado."
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr "Error: getcvard.php necesita un parametro para exportar a vcard."
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7782,7 +7782,7 @@ 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
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -7790,17 +7790,17 @@ msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:139
+#: html/main.php:155
 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
+#: html/main.php:284
 #, 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
+#: html/main.php:313
 #, fuzzy
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
@@ -7884,6 +7884,24 @@ 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"
 
+#: 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 ""
+"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
+
+#: 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 "Directorio"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Entrando"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Pulse aquí para entrar"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Detectado conflicto de sesiones."
@@ -7912,24 +7930,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Salir"
 
-#: 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 ""
-"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
-
-#: 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 "Directorio"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Pulse aquí para entrar"
-
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7952,6 +7952,24 @@ msgstr ""
 "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/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7972,24 +7990,6 @@ msgstr "Salir"
 msgid "Signed in:"
 msgstr "Entrando"
 
-#: 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 "La instalación continua"
-
-#: 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 ""
-"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"
@@ -8004,23 +8004,23 @@ msgstr ""
 "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_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 "La instalación continua"
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 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."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 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."
+"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/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4

diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po
index 34120b364bb9ddddfa1c706dc1d9fb6ae41cf24b..f02e86d8334e4ec39c3c25273063c222d8b9a198 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -169,9 +169,9 @@ msgid "Export"
 msgstr "Exporter"
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr "Importer"
 
@@ -211,160 +211,140 @@ 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/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Sélectionner les adresses à ajouter"
 
-#: 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/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Filtres"
 
-#: 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/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Afficher les adresses du département"
 
-#: 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/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Sélectionner le département où sera effectuée la recherche"
 
-#: 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/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Afficher les adresses correspondantes"
 
-#: 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/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Expression régulière pour sélectionner les adresses correspondantes"
 
-#: 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/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Afficher les adresses de l'utilisateur"
 
-#: 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/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Utilisateur dont on montre les adresses"
 
-#: 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/mail_locals.tpl:41
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: 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/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
+#: plugins/admin/groups/group_objects.tpl:49
+#: 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/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
+msgid "Add"
+msgstr "Ajouter"
 
-#: 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/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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"
 
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
@@ -405,38 +385,6 @@ msgstr "Adresses alternatives"
 msgid "List of alternative mail addresses"
 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/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/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
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:49
-#: 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/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:710
-#: plugins/gofon/phoneaccount/generic.tpl:13
-msgid "Add"
-msgstr "Ajouter"
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
@@ -453,13 +401,13 @@ msgstr "Ajouter"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: 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/remove.tpl:15
 #: 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/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -478,7 +426,8 @@ 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"
@@ -553,9 +502,8 @@ msgid "disables all Mail options!"
 msgstr "désactive toutes les options de messagerie!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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
@@ -565,52 +513,11 @@ msgstr "d
 #: 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
+#: plugins/gofon/phoneaccount/main.inc:104
 msgid "Finish"
 msgstr "Terminé"
 
-#: 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 "Annuler"
-
 #: 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
@@ -631,82 +538,167 @@ msgstr ""
 msgid "Edit"
 msgstr "Editer"
 
-#: plugins/personal/mail/main.inc:124
-msgid "User mail settings"
-msgstr "Configuration du compte de messagerie de l'utilisateur"
+#: plugins/personal/mail/main.inc:124
+msgid "User mail settings"
+msgstr "Configuration du compte de messagerie de l'utilisateur"
+
+#: 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/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Sélectionner les adresses à ajouter"
+#: 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/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtres"
+#: 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/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Afficher les adresses du département"
+#: 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/mail_locals.tpl:27
-#: 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
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Sélectionner le département où sera effectuée la recherche"
+#: 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/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Afficher les adresses correspondantes"
+#: 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/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-msgstr "Expression régulière pour sélectionner les adresses correspondantes"
+#: 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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-msgstr "Afficher les adresses de l'utilisateur"
+#: 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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-msgstr "Utilisateur dont on montre les adresses"
+#: 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/password/class_password.inc:5
-#: 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 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/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/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/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
@@ -769,11 +761,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -785,6 +777,18 @@ msgstr ""
 msgid "Back"
 msgstr "Retour"
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "Mot de passe"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -825,20 +829,67 @@ 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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr "Répertoire Home"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Afficher les systèmes du département"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: 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/generic.tpl:21
+msgid "Primary group"
+msgstr "Groupe principal"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Statut"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Forcer l'UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Appartient aux groupes"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Attention: NFS ne supporte pas plus de 16 groupes!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Compte"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Environnement"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Imprimante par défaut"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Langue par défaut"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "Système de Confiance"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -869,7 +920,8 @@ 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
@@ -898,97 +950,52 @@ msgstr ""
 msgid "Show functional groups"
 msgstr "Afficher les groupes fonctionnels"
 
-#: plugins/personal/posix/posix_groups.tpl:36
-msgid "Display groups of department"
-msgstr "Afficher les groupes du département"
-
-#: plugins/personal/posix/posix_groups.tpl:48
-#: 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: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: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: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"
-
-#: 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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:626
-msgid "Home directory"
-msgstr "Répertoire Home"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Groupe principal"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Statut"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Forcer l'UID/GID"
+#: plugins/personal/posix/posix_groups.tpl:36
+msgid "Display groups of department"
+msgstr "Afficher les groupes du département"
 
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
+#: plugins/personal/posix/posix_groups.tpl:48
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:51
+msgid "Display groups matching"
+msgstr "Afficher les groupes correspondant"
 
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
+#: plugins/personal/posix/posix_groups.tpl:51
+#: 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/generic.tpl:64
-msgid "Group membership"
-msgstr "Appartient aux groupes"
+#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/admin/groups/headpage.tpl:74
+msgid "Display groups of user"
+msgstr "Afficher les groupes contenant des utilisateurs"
 
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Attention: NFS ne supporte pas plus de 16 groupes!)"
+#: plugins/personal/posix/posix_groups.tpl:61
+#: plugins/admin/groups/headpage.tpl:78
+msgid "User name of which groups are shown"
+msgstr "Utilisateur dont on montre les groupes"
 
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Compte"
+#: 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"
 
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Environnement"
+#: 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/generic.tpl:101
-msgid "Default printer"
-msgstr "Imprimante par défaut"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Sélectionner les hôtes à ajouter"
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "Langue par défaut"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Afficher les systèmes du département"
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "Système de Confiance"
+#: 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/main.inc:131
 msgid "Unix settings"
@@ -1234,7 +1241,8 @@ 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."
@@ -1272,11 +1280,13 @@ 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."
@@ -1288,7 +1298,8 @@ 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
@@ -1321,7 +1332,8 @@ 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"
@@ -1515,7 +1527,8 @@ 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!"
@@ -1566,7 +1579,8 @@ msgstr "Veuillez entrer un num
 
 #: 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>."
+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>."
@@ -1597,7 +1611,8 @@ msgstr "Impossible d'ajouter un utilisateur 
 
 #: 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'."
+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'."
@@ -1686,16 +1701,6 @@ msgstr "Le champ 'Pager' contient un num
 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"
@@ -1712,8 +1717,8 @@ 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/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nom"
@@ -1757,9 +1762,9 @@ msgstr "Sexe"
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1882,151 +1887,321 @@ msgstr "Travail"
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/generic.tpl:281
-msgid "Subject area"
-msgstr "Zone de sujet"
+#: plugins/personal/generic/generic.tpl:281
+msgid "Subject area"
+msgstr "Zone de sujet"
+
+#: plugins/personal/generic/generic.tpl:289
+msgid "Functional title"
+msgstr "Fonction"
+
+#: plugins/personal/generic/generic.tpl:296
+msgid "Role"
+msgstr "Rôle"
+
+#: plugins/personal/generic/generic.tpl:308
+msgid "Person locality"
+msgstr "Lieu de résidence"
+
+#: plugins/personal/generic/generic.tpl:316
+msgid "Unit"
+msgstr "Unité"
+
+#: plugins/personal/generic/generic.tpl:323
+msgid "Street"
+msgstr "Rue"
+
+#: plugins/personal/generic/generic.tpl:329
+#: plugins/addons/addressbook/address_edit.tpl:81
+#: plugins/addons/addressbook/address_info.tpl:70
+msgid "Postal code"
+msgstr "Code postal"
+
+#: plugins/personal/generic/generic.tpl:335
+msgid "House identifier"
+msgstr "Identifiant du batiment"
+
+#: plugins/personal/generic/generic.tpl:357
+msgid "Please use the phone tab"
+msgstr "Veuillez utiliser l'onglet téléphone"
+
+#: plugins/personal/generic/generic.tpl:370
+msgid "Last delivery"
+msgstr "Dernière distribution"
+
+#: plugins/personal/generic/generic.tpl:377
+msgid "Public visible"
+msgstr "Visible par tous"
+
+#: 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_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/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/main.inc:187
+msgid "Generic user information"
+msgstr "Information générales sur l'utilisateur"
+
+#: plugins/personal/generic/generic_certs.tpl:8
+msgid "Standard certificate"
+msgstr "Certificat standard"
+
+#: plugins/personal/generic/generic_certs.tpl:17
+#: plugins/personal/generic/generic_certs.tpl:37
+#: plugins/personal/generic/generic_certs.tpl:57
+#: 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:712
+#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
+msgid "Remove"
+msgstr "Supprimer"
+
+#: plugins/personal/generic/generic_certs.tpl:28
+msgid "S/MIME certificate"
+msgstr "Certificat S/MIME"
+
+#: plugins/personal/generic/generic_certs.tpl:48
+msgid "PKCS12 certificate"
+msgstr "Certificat PKCS12"
+
+#: plugins/personal/generic/generic_certs.tpl:65
+msgid "Certificate serial number"
+msgstr "Numéro de série du certificat"
+
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr "Créer un compte Intranet"
+
+#: plugins/personal/connectivity/proxy.tpl:16
+msgid "Proxy account"
+msgstr "Compte Proxy"
+
+#: 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/proxy.tpl:35
+msgid "Limit proxy access to working time"
+msgstr "Accès au proxy autorisé durant la plage horaire suivante"
+
+#: 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/proxy.tpl:80
+msgid "per"
+msgstr "par"
+
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "Compte FTP"
+
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr "Bande passante"
+
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Bande passante montante"
+
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "kb/sec"
+
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Bande passante descendante"
+
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
+msgstr "Quota"
+
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "Fichier"
+
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Taille"
+
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr "Ratio"
+
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "Données envoyées / reçues"
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Cliquez ici pour désactivez l'accès FTP"
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Désactiver temporairement l'accès FTP"
+
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "Compte PHPGroupware"
 
-#: plugins/personal/generic/generic.tpl:289
-msgid "Functional title"
-msgstr "Fonction"
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
 
-#: plugins/personal/generic/generic.tpl:296
-msgid "Role"
-msgstr "Rôle"
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
+msgstr "Compte Kolab"
 
-#: plugins/personal/generic/generic.tpl:308
-msgid "Person locality"
-msgstr "Lieu de résidence"
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+msgstr ""
+"L'extension Kolab est désactivée. Ces paramètres peuvent être ajustés si "
+"vous ajoutez un compte mail."
 
-#: plugins/personal/generic/generic.tpl:316
-msgid "Unit"
-msgstr "Unité"
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
+msgstr "Delegation"
 
-#: plugins/personal/generic/generic.tpl:323
-msgid "Street"
-msgstr "Rue"
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
+msgstr "Taille des quota email"
 
-#: plugins/personal/generic/generic.tpl:329
-#: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70
-msgid "Postal code"
-msgstr "Code postal"
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
+msgstr "Pas de taille limite pour l'envoi de mail"
 
-#: plugins/personal/generic/generic.tpl:335
-msgid "House identifier"
-msgstr "Identifiant du batiment"
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
+msgstr "Information de disponibilité"
 
-#: plugins/personal/generic/generic.tpl:357
-msgid "Please use the phone tab"
-msgstr "Veuillez utiliser l'onglet téléphone"
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
+msgstr "URL"
 
-#: plugins/personal/generic/generic.tpl:370
-msgid "Last delivery"
-msgstr "Dernière distribution"
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr "Futur"
 
-#: plugins/personal/generic/generic.tpl:377
-msgid "Public visible"
-msgstr "Visible par tous"
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
+msgstr "jours"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Suppression de l'image personnelle"
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
+msgstr "Politique d'invitation"
 
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:114
-msgid "Save"
-msgstr "Enregistrer"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr "Compte Open-Xchange"
 
-#: plugins/personal/generic/generic_certs.tpl:8
-msgid "Standard certificate"
-msgstr "Certificat standard"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
+msgstr "Désactivé, le support pour Postgresql est manquant"
 
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-#: 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:712
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
-msgid "Remove"
-msgstr "Supprimer"
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
+msgstr "Compte Open Xchange"
 
-#: plugins/personal/generic/generic_certs.tpl:28
-msgid "S/MIME certificate"
-msgstr "Certificat S/MIME"
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr "Se souvenir"
 
-#: plugins/personal/generic/generic_certs.tpl:48
-msgid "PKCS12 certificate"
-msgstr "Certificat PKCS12"
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr "Rendez vous"
 
-#: plugins/personal/generic/generic_certs.tpl:65
-msgid "Certificate serial number"
-msgstr "Numéro de série du certificat"
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr "Tâches"
 
-#: 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/oxchange.tpl:33
+msgid "User Information"
+msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Information générales sur l'utilisateur"
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr "Zone Horaire de l'utilisateur"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr "Proxy"
 
-#: 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_proxyAccount.inc:76
+msgid "KB"
+msgstr "KB"
 
-#: 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_proxyAccount.inc:76
+msgid "GB"
+msgstr "GB"
 
-#: 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_proxyAccount.inc:77
+msgid "hour"
+msgstr "heure"
 
-#: 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_proxyAccount.inc:77
+msgid "day"
+msgstr "jour"
 
-#: 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/class_proxyAccount.inc:77
+msgid "week"
+msgstr "semaine"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "month"
+msgstr "mois"
 
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Compte Proxy"
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
+msgstr "La valeur de pour le quota est vide."
 
-#: 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_proxyAccount.inc:131
+msgid "Numerical value for Quota Setting is not valid."
+msgstr "La valeur dans le champ 'Quota Setting' n'est pas valide."
 
-#: 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/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Compte WebDAV"
 
-#: 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_intranetAccount.inc:14
+msgid "Intranet"
+msgstr "Intranet"
 
-#: plugins/personal/connectivity/proxy.tpl:80
-msgid "per"
-msgstr "par"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr "Kolab"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid "You're trying to add an invalid email address to the list of delegations."
+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."
@@ -2071,7 +2246,8 @@ msgstr ""
 
 #: 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."
+msgstr ""
+"La valeur spécifiée comme URL d'information de disponibilité est invalide."
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:248
 #, php-format
@@ -2085,63 +2261,31 @@ 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"
-msgstr "WebDAV"
-
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "Compte PHPGroupware"
-
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
-msgstr "Compte Kolab"
-
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-msgstr ""
-"L'extension Kolab est désactivée. Ces paramètres peuvent être ajustés si "
-"vous ajoutez un compte mail."
-
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
-msgstr "Delegation"
-
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
-msgstr "Taille des quota email"
-
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
-msgstr "Pas de taille limite pour l'envoi de mail"
-
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
-msgstr "Information de disponibilité"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/connectivity/kolab.tpl:35
-msgid "URL"
-msgstr "URL"
+#: 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/kolab.tpl:39
-msgid "Future"
-msgstr "Futur"
+#: 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/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
-msgstr "jours"
+#: 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/kolab.tpl:45
-msgid "Invitation policy"
-msgstr "Politique d'invitation"
+#: 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/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Compte WebDAV"
+#: 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/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -2182,135 +2326,58 @@ msgstr ""
 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"
-
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Bande passante"
-
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Bande passante montante"
-
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "kb/sec"
-
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Bande passante descendante"
-
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Quota"
-
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "Fichier"
-
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
-msgstr "Taille"
-
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Ratio"
-
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "Données envoyées / reçues"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Cliquez ici pour désactivez l'accès FTP"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Désactiver temporairement l'accès FTP"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Compte Open-Xchange"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
-msgstr "Désactivé, le support pour Postgresql est manquant"
-
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
-msgstr "Compte Open Xchange"
-
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
-msgstr "Se souvenir"
-
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
-msgstr "Rendez vous"
-
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
-msgstr "Tâches"
-
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
-msgstr "Information Utilisateur"
-
-#: plugins/personal/connectivity/oxchange.tpl:37
-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"
-msgstr "Proxy"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
-msgstr "KB"
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Liste des listes rouges"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
-msgstr "GB"
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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_proxyAccount.inc:77
-msgid "hour"
-msgstr "heure"
+#: plugins/gofax/blocklists/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Ce menu permet d'ajouter, supprimer et modifier les listes rouge "
+"sélectionnées. Vous pouvez utiliser les filtres lorsque vous travaillez avec "
+"un grand nombre de listes rouge."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
-msgstr "jour"
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Sélectionnez afin d'afficher les numéros d'appels de la liste rouge"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
-msgstr "semaine"
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr "Afficher les numéros d'appels de la liste rouge"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
-msgstr "mois"
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr "Sélectionnez afin de voir les listes rouges de correspondants"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
-msgstr "La valeur de pour le quota est vide."
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr "Afficher les listes rouges de correspondants"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
-msgstr "La valeur dans le champ 'Quota Setting' n'est pas valide."
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr "Afficher les listes correspondantes"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr "Intranet"
+#: 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/generic.tpl:8
 msgid "List name"
@@ -2332,7 +2399,8 @@ 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"
+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
@@ -2354,17 +2422,6 @@ msgstr "Texte descriptif pour cette liste rouge"
 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."
@@ -2558,7 +2615,8 @@ 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
@@ -2575,76 +2633,39 @@ 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/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
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "Avertissement"
-
-#: plugins/gofax/blocklists/remove.tpl:7
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Veuillez vous assurez que vous voulez effectuer cette opération. Toutes les "
-"données seront perdues étant donné qu'il est impossible pour GOsa de "
-"récupérer vos données."
-
-#: plugins/gofax/blocklists/remove.tpl:11
-#: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
-#: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
-#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
-msgid ""
-"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
-"abort."
 msgstr ""
-"D'accord - si vous êtes sur - cliquez sur <i>Supprimer</i> pour continuer ou "
-"sur <i>Annuler</i> pour abandonner."
-
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Liste des listes rouges"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"Ce menu permet d'ajouter, supprimer et modifier les listes rouge "
-"sélectionnées. Vous pouvez utiliser les filtres lorsque vous travaillez avec "
-"un grand nombre de listes rouge."
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Sélectionnez afin d'afficher les numéros d'appels de la liste rouge"
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Afficher les numéros d'appels de la liste rouge"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Sélectionnez afin de voir les listes rouges de correspondants"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Afficher les listes rouges de correspondants"
+"Vous n'avez pas l'autorisation de créer des listes rouge sur cette base."
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Afficher les listes correspondantes"
+#: 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
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
+#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/default/islocked.tpl:6
+msgid "Warning"
+msgstr "Avertissement"
 
-#: 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/remove.tpl:7
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Veuillez vous assurez que vous voulez effectuer cette opération. Toutes les "
+"données seront perdues étant donné qu'il est impossible pour GOsa de "
+"récupérer vos données."
+
+#: plugins/gofax/blocklists/remove.tpl:11
+#: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
+#: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
+#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
+msgid ""
+"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
+"abort."
+msgstr ""
+"D'accord - si vous êtes sur - cliquez sur <i>Supprimer</i> pour continuer ou "
+"sur <i>Annuler</i> pour abandonner."
 
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
@@ -2754,8 +2775,8 @@ msgid "List of predefined blocklists"
 msgstr "Liste des listes rouges prédéfinies"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -2812,7 +2833,8 @@ 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."
@@ -2826,55 +2848,6 @@ msgstr ""
 "La réception d'un fax sur une imprimante ne fonctionnera que si une "
 "imprimante valable est mentionnée. Veuillez corriger votre choix."
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr "prévisualisation du FAX - Veuillez attendre"
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr "Cliquez sur le fax pour le télécharger"
-
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr "Utilisateur"
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr "Date / Heure"
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr "MSN de l'expéditeur"
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr "ID de l'expéditeur"
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr "MSN du correspondant"
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr "ID du correspondant"
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr "Statut"
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr "Temps de transfert"
-
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr "# pages"
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2909,6 +2882,11 @@ msgstr "pendant"
 msgid "Search"
 msgstr "Recherche"
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr "Utilisateur"
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2923,12 +2901,60 @@ msgstr "Exp
 msgid "Receiver"
 msgstr "Correspondant"
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr "# pages"
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "La recherche n'a renvoyé aucun résultat..."
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr "prévisualisation du FAX - Veuillez attendre"
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr "Cliquez sur le fax pour le télécharger"
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr "FAX ID"
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr "Date / Heure"
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr "MSN de l'expéditeur"
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr "ID de l'expéditeur"
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr "MSN du correspondant"
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr "ID du correspondant"
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr "Statut"
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr "Temps de transfert"
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Rapports des Fax"
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Rapports des Fax"
@@ -2964,10 +2990,6 @@ msgstr ""
 msgid "Y-M-D"
 msgstr "A-M-J"
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Rapports des Fax"
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -3011,7 +3033,8 @@ 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"
@@ -3045,6 +3068,17 @@ msgstr "Appel en cours ..."
 msgid "Dial"
 msgstr "Appeler"
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Ceci inclut toutes les données du carnet d'adresse situées dans cette "
+"entrée. Veuillez vérifier si vous voulez réaliser cette opération, toutes "
+"les données seront définitivement perdues, il n'y a pas de moyen pour GOsa "
+"de les récupérer."
+
 #: 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"
@@ -3084,17 +3118,6 @@ msgstr "Ville"
 msgid "Country"
 msgstr "Pays"
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"Ceci inclut toutes les données du carnet d'adresse situées dans cette "
-"entrée. Veuillez vérifier si vous voulez réaliser cette opération, toutes "
-"les données seront définitivement perdues, il n'y a pas de moyen pour GOsa "
-"de les récupérer."
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Carnet d'adresses"
@@ -3176,17 +3199,65 @@ 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."
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+"L'extension CSV permet de générer des comptes utilisateurs depuis un fichier "
+"contenant des valeurs séparées par des virgules. L'administrateur peut "
+"choisir quelle colonne doivent être transférées vers quel attribut. Notez "
+"que vous devez au moins avoir le UID, GIVENNAME et SURENAME fournis."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr "Sélectionnez le fichier CSV à importer"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr "Parcourir"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr "Sélectionnez le modèle"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr "Toutes les entrées on été écrites correctement dans l'arbre LDAP."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr "Oups. Il à eu une erreur lors de l'importation de vos données."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr "Voici le rapport de l'état de votre importation:"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr "Sélectionnez le modèle"
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr "Manager LDAP"
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3194,7 +3265,8 @@ 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."
@@ -3247,72 +3319,32 @@ msgid ""
 "existing entries. Remember that GOsa will not check your ldifs for GOsa "
 "conformance."
 msgstr ""
-"L'extension d'exportation/importation au format LDIF permet exporter/"
-"importer une série d'entrées au format ldif dans l'annuaire. Vous pouvez "
-"utiliser cette fonctionnalité pour ajouter de nouvelles entrées ou modifier "
-"des entrées existantes.Rappelez vous que GOsa ne vérifiera pas vos ldifs par "
-"rapport au schéma utilisés par GOsa."
-
-#: plugins/addons/ldapmanager/contentimport.tpl:10
-msgid "Import LDIF File"
-msgstr "Importation d'un fichier LDIF"
-
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr "Parcourir"
-
-#: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
-msgstr "Modifier les attributs existants"
-
-#: plugins/addons/ldapmanager/contentimport.tpl:33
-msgid "Overwrite existing entry"
-msgstr "Récrire cette entrée"
-
-#: plugins/addons/ldapmanager/contentimport.tpl:40
-msgid "Import successful"
-msgstr "Importation réussie"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-"L'extension CSV permet de générer des comptes utilisateurs depuis un fichier "
-"contenant des valeurs séparées par des virgules. L'administrateur peut "
-"choisir quelle colonne doivent être transférées vers quel attribut. Notez "
-"que vous devez au moins avoir le UID, GIVENNAME et SURENAME fournis."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr "Sélectionnez le fichier CSV à importer"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr "Sélectionnez le modèle"
+"L'extension d'exportation/importation au format LDIF permet exporter/"
+"importer une série d'entrées au format ldif dans l'annuaire. Vous pouvez "
+"utiliser cette fonctionnalité pour ajouter de nouvelles entrées ou modifier "
+"des entrées existantes.Rappelez vous que GOsa ne vérifiera pas vos ldifs par "
+"rapport au schéma utilisés par GOsa."
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Toutes les entrées on été écrites correctement dans l'arbre LDAP."
+#: plugins/addons/ldapmanager/contentimport.tpl:10
+msgid "Import LDIF File"
+msgstr "Importation d'un fichier LDIF"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr "Oups. Il à eu une erreur lors de l'importation de vos données."
+#: plugins/addons/ldapmanager/contentimport.tpl:24
+msgid "Modify existing attributes"
+msgstr "Modifier les attributs existants"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr "Voici le rapport de l'état de votre importation:"
+#: plugins/addons/ldapmanager/contentimport.tpl:33
+msgid "Overwrite existing entry"
+msgstr "Récrire cette entrée"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr "Sélectionnez le modèle"
+#: plugins/addons/ldapmanager/contentimport.tpl:40
+msgid "Import successful"
+msgstr "Importation réussie"
 
 #: 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"
@@ -3358,23 +3390,55 @@ msgstr "Cliquez ici pour sauvegarder l'arbre LDAP dans un fichier"
 msgid "Click here to save the LDAP Export "
 msgstr "Cliquez ici pour exporter l'arbre LDAP "
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr "Manager LDAP"
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 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!"
 msgstr "Une erreur s'est produite lors de l'exportation!"
 
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr "Afficher les machines"
+
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr "Log Level"
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr "Intervalle de temps"
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr "Entrée la chaîne de caractères à chercher"
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr "Ensemble de Règles"
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr "Niveau"
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr "Nom d'hôte"
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr "Message"
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr "Affichage des logs système"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Logs systèmes"
@@ -3434,90 +3498,19 @@ msgstr ""
 "Impossible de se connecter à la base de données des logs, aucun log ne peut "
 "être affiché!"
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Afficher les machines"
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Log Level"
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Intervalle de temps"
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Entrée la chaîne de caractères à chercher"
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Ensemble de Règles"
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Niveau"
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Nom d'hôte"
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Message"
-
-#: plugins/addons/logview/main.inc:23
-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/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Liste des groupes"
 
-#: plugins/admin/groups/class_groupGeneric.inc:591
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"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 ""
-"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à."
+"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/mail.tpl:11
 msgid "Primary mail address for this shared folder"
@@ -3525,7 +3518,8 @@ msgstr "Adresse de messagerie principale pour ce r
 
 #: 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"
@@ -3543,19 +3537,15 @@ 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
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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 ""
-"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."
+"Ce groupe est un groupe principal contenant des utilisateurs. Veuillez vous "
+"assurez que vous voulez bien exécuter cette action. Toutes les données "
+"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"
@@ -3599,51 +3589,110 @@ msgstr "Modifier cette entr
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
-#: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
-msgid "Posix"
-msgstr "Posix"
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:705
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:375
+#: plugins/admin/applications/class_applicationManagement.inc:345
+#: plugins/admin/ogroups/class_ogroupManagement.inc:481
+#: plugins/gofon/reports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Applications"
+
+#: plugins/admin/groups/class_groupManagement.inc:384
+msgid "Groupname"
+msgstr "Nom du groupe"
+
+#: plugins/admin/groups/class_groupManagement.inc:385
+#: 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
+#: plugins/admin/ogroups/class_ogroupManagement.inc:390
+msgid "Properties"
+msgstr "Propriétés"
+
+#: plugins/admin/groups/class_groupManagement.inc:390
+#: plugins/admin/applications/class_applicationManagement.inc:359
+#: plugins/admin/ogroups/class_ogroupManagement.inc:395
+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/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:345
-#: plugins/admin/ogroups/class_ogroupManagement.inc:481
-#: plugins/gofon/reports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Applications"
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
+msgstr "Applications utilisées"
 
-#: plugins/admin/groups/class_groupManagement.inc:384
-msgid "Groupname"
-msgstr "Nom du groupe"
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Editer les paramètres"
 
-#: plugins/admin/groups/class_groupManagement.inc:385
-#: 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
-#: plugins/admin/ogroups/class_ogroupManagement.inc:390
-msgid "Properties"
-msgstr "Propriétés"
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Editer les paramètres optionnels de l'application"
 
-#: plugins/admin/groups/class_groupManagement.inc:390
-#: plugins/admin/applications/class_applicationManagement.inc:359
-#: plugins/admin/ogroups/class_ogroupManagement.inc:395
-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/application.tpl:21
+msgid "Available applications"
+msgstr "Applications disponibles"
 
-#: 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 ""
-"Ce groupe est un groupe principal contenant des utilisateurs. Veuillez vous "
-"assurez que vous voulez bien exécuter cette action. Toutes les données "
-"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
-"données."
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Objet"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Options des applications"
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Appliquer cet ACL uniquement pour l'entrée de l'utilisateur"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3684,7 +3733,8 @@ 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."
@@ -3693,55 +3743,9 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Veuillez sélectionner un serveur de messagerie valide."
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Objet"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Appliquer cet ACL uniquement pour l'entrée de l'utilisateur"
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Applications utilisées"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Editer les paramètres"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Editer les paramètres optionnels de l'application"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Applications disponibles"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Sélectionnez les utilisateurs à ajouter"
-
-#: plugins/admin/groups/group_objects.tpl:30
-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
-msgid "Display users matching"
-msgstr "Afficher les utilisateurs correspondants"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr "Expression régulière concordant avec les noms des utilisateurs"
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr "Ce 'dn' n'est pas un conteneur pour les acls."
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr "Tous les champs sont modifiables"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Administrateurs du répertoire"
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -3789,9 +3793,35 @@ msgstr "Les membres sont dans un groupe t
 msgid "Group members"
 msgstr "Membre du groupe"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Administrateurs du répertoire"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Sélectionnez les utilisateurs à ajouter"
+
+#: plugins/admin/groups/group_objects.tpl:30
+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
+msgid "Display users matching"
+msgstr "Afficher les utilisateurs correspondants"
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr "Expression régulière concordant avec les noms des utilisateurs"
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr "Ce 'dn' n'est pas un conteneur pour les acls."
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+msgstr "Tous les champs sont modifiables"
+
+#: 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."
@@ -3823,7 +3853,8 @@ 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."
@@ -3834,51 +3865,90 @@ msgstr "L'application s
 msgid "The application named %s is no longer available and has been removed."
 msgstr "L'application %s n'est plus disponible et à été supprimée."
 
-#: plugins/admin/users/password.tpl:2
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Liste des utilisateurs"
+
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
 msgstr ""
-"Pour changer le mot de passe des utilisateurs, utilisez le champ ci-dessous. "
-"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
-"mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
+"Ce menu permet d'ajouter, modifier ou supprimer le ou les utilisateur(s) "
+"sélectionné(s). Si vous avez un grand nombre d'utilisateurs il est conseillé "
+"d'utiliser les filtres."
 
-#: 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/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Sélectionnez afin d'afficher les modèles des pseudo utilisateurs"
 
-#: 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/headpage.tpl:38
+msgid "Show templates"
+msgstr "Afficher les modèles"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
 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."
+"Sélectionnez afin d'afficher les utilisateurs qui ont seulement un objet GOsa"
 
-#: 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/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Afficher les utilisateurs fonctionnels"
 
-#: 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/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte posix"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administration des utilisateurs"
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+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"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Afficher les utilisateurs de messagerie"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte samba"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Afficher les utilisateurs samba"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte proxy"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Afficher les utilisateurs proxy"
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"Cela inclut toutes les données des comptes, les droits d'accès, la "
+"configuration imap,etc. pour cet utilisateur. Veuillez vous assurez que vous "
+"voulez effectuez cette opération. Toutes les données seront perdues étant "
+"donné qu'il est impossible pour GOsa de récupérer vos données."
+
+#: plugins/admin/users/password.tpl:2
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
+msgstr ""
+"Pour changer le mot de passe des utilisateurs, utilisez le champ ci-dessous. "
+"Les changements prennent effet immédiatement. Veuillez mémoriser le nouveau "
+"mot de passe sinon l'utilisateur ne pourra pas s'identifier sans celui-ci."
 
 #: plugins/admin/users/class_userManagement.inc:25
 msgid "Users"
@@ -3887,7 +3957,8 @@ 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!"
+msgstr ""
+"Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
 
 #: plugins/admin/users/class_userManagement.inc:349
 #, php-format
@@ -3932,8 +4003,8 @@ msgstr "mot de passe"
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: 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
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -3985,78 +4056,64 @@ msgstr "en ligne"
 msgid "Offline"
 msgstr "hors-ligne"
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Cela inclut toutes les données des comptes, les droits d'accès, la "
-"configuration imap,etc. pour cet utilisateur. Veuillez vous assurez que vous "
-"voulez effectuez cette opération. Toutes les données seront perdues étant "
-"donné qu'il est impossible pour GOsa de récupérer vos données."
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Modèle"
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "Liste des utilisateurs"
+#: 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/headpage.tpl:24
+#: plugins/admin/users/template.tpl:6
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+"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 ""
-"Ce menu permet d'ajouter, modifier ou supprimer le ou les utilisateur(s) "
-"sélectionné(s). Si vous avez un grand nombre d'utilisateurs il est conseillé "
-"d'utiliser les filtres."
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Sélectionnez afin d'afficher les modèles des pseudo utilisateurs"
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr "Afficher les modèles"
-
-#: 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"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Afficher les utilisateurs fonctionnels"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte posix"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Afficher les utilisateurs Unix"
+"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/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"
+#: 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/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Afficher les utilisateurs de messagerie"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administration des utilisateurs"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte samba"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Liste des applications"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Afficher les utilisateurs samba"
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+"Ce menu permet l'ajout, la suppression et la modification des applications "
+"sélectionnées. Si vous avez un grand nombre d'applications il est conseillé "
+"d'utiliser les filtres."
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte proxy"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
+msgstr "Afficher les applications correspondantes"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Afficher les utilisateurs proxy"
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
+msgstr "Expression régulière pour faire correspondre le nom des applications"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -4065,7 +4122,7 @@ msgid "Application name"
 msgstr "Nom de l'application"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -4133,7 +4190,8 @@ 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."
+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."
@@ -4165,53 +4223,11 @@ msgstr ""
 "voulez effectuer cette opération. Toutes les données seront perdues étant "
 "donné qu'il est impossible pour GOsa de récupérer vos données."
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Liste des applications"
-
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
-msgstr ""
-"Ce menu permet l'ajout, la suppression et la modification des applications "
-"sélectionnées. Si vous avez un grand nombre d'applications il est conseillé "
-"d'utiliser les filtres."
-
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
-msgstr "Afficher les applications correspondantes"
-
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
-msgstr "Expression régulière pour faire correspondre le nom des applications"
-
 #: plugins/admin/applications/main.inc:38
 #: plugins/admin/applications/main.inc:40
 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."
@@ -4238,6 +4254,47 @@ 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/headpage.tpl:6
+msgid "List of departments"
+msgstr "Liste des départements"
+
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+"Ce menu vous permet de d'ajouter, supprimer et éditer les départements "
+"sélectionnés. Si vous avez un grand nombre de départements il est conseillé "
+"d'utiliser les filtres."
+
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr "Afficher les départements correspondants"
+
+#: 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"
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nom du département"
@@ -4305,31 +4362,31 @@ msgstr ""
 "fichier avant de réaliser cette action. Appuyez sur <i>Supprimer</i> pour "
 "continuer ou <i>Annuler</i> pour abandonner."
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Liste des départements"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
+msgstr "Gestion des départements"
 
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
-"Ce menu vous permet de d'ajouter, supprimer et éditer les départements "
-"sélectionnés. Si vous avez un grand nombre de départements il est conseillé "
-"d'utiliser les filtres."
+"Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Afficher les départements correspondants"
+#: 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/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "Expression régulière pour faire correspondre le nom des applications"
+#: 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/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
-msgstr "Gestion des départements"
+#: 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
@@ -4372,26 +4429,17 @@ 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/systems/network.tpl:1
+msgid "Network settings"
+msgstr "Configuration réseau"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr " Veuillez choisir un autre nom."
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
+msgstr "Adresse IP"
+
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr "Adresse MAC"
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
@@ -4429,49 +4477,37 @@ msgstr "statut inconnu"
 msgid "offline"
 msgstr "hors-ligne"
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Configuration réseau"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "Exportation Nfs"
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
-msgstr "Adresse IP"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Services de temps"
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr "Adresse MAC"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Service LDAP"
 
-#: 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:72
+msgid "Terminal Service"
+msgstr "Services de terminaux"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr "Ce 'dn' n'a pas d'extensions réseaux."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Désactiver temporairement le login"
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
-msgstr "Le champ obligatoire 'Component name' n'est pas rempli."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Répertoire des polices de caractères"
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Service de logs systèmes"
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Services d'impression"
 
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
@@ -4569,41 +4605,113 @@ msgstr "Service Son"
 msgid "GUI"
 msgstr "Interface graphique"
 
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr "Ce 'dn' n'a pas d'extensions réseaux."
+
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
+msgstr "Le champ obligatoire 'Component name' n'est pas rempli."
+
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
+
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
+
 #: 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/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Modèle de terminaux"
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Services de temps"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Nom du terminal"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Service LDAP"
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Sélectionnez la branche où placer le terminal"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Services de terminaux"
+#: 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/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Désactiver temporairement le login"
+#: 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/servservice.tpl:80
-msgid "Font path"
-msgstr "Répertoire des polices de caractères"
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Serveur Primaire"
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Service de logs systèmes"
+#: 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/servservice.tpl:101
-msgid "Print Service"
-msgstr "Services d'impression"
+#: 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:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Action"
+
+#: 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_terminalService.inc:83
 msgid "default"
@@ -4647,118 +4755,43 @@ msgstr ""
 "Veuillez spécifier une plage valide pour la fréquence de synchronisation "
 "Horizontale."
 
-#: 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/server.tpl:6
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Sélectionnez la branche où placer le terminal"
-
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Action"
-
-#: plugins/admin/systems/server.tpl:42
-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/server.tpl:42
+msgid "Select action to execute for this server"
+msgstr "Sélectionnez l'opération à exécuter sur le serveur"
 
-#: 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/phone.tpl:6
+msgid "Phone name"
+msgstr "Nom du téléphone"
 
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Serveur de logs systèmes"
+#: 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/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/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Modèle de station de travail"
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Serveur NTP"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Nom de la station de travail"
 
-#: 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/printer.tpl:6
+msgid "Printer name"
+msgstr "Nom de l'imprimante"
 
-#: 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/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_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
@@ -4872,18 +4905,6 @@ 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."
@@ -5056,20 +5077,94 @@ msgstr "Mod
 msgid "Workstation template for"
 msgstr "Modèle de station de travail pour"
 
-#: 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/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "Service POP3"
 
-#: 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:22
+msgid "POP3/SSL service"
+msgstr "Service POP3/SSL"
+
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "Service IMAP"
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "Service IMAP/SSL"
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Service sieve"
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+"service des options de disponibilités par FTP (ancien, pas compatible avec "
+"les options de disponibilités de Kolab2)"
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "Service d'option de disponibilité par HTTP (ancien)"
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Scan des messages par Amavis (virus/spam)"
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Préférences des quotas"
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Préférences des options de disponibilités"
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+"Permettre le téléchargement des informations de disponibilités de manière "
+"anonyme"
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "Réseaux SMTP privilègiés"
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Machines/Réseaux qui peuvent relayer du mail"
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr "Entrez des valeurs multiples, séparés avec"
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "Relais SMTP"
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Vérification de l'enregistrement MX pour le serveur relais"
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Machine utilisée pour relayer les mails"
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Accepter le courrier électronique venant d'internet"
+
+#: 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/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."
@@ -5078,79 +5173,196 @@ msgstr ""
 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."
-msgstr ""
-"Ce serveur à l'option DNS désactivé. Vous pouvez l'activer en cliquant sur "
-"le bouton ci-dessous."
+#: plugins/admin/systems/class_servDNS.inc:37
+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/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Accès kadmin Kerberos"
+
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Realm Kerberos"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Administrateur"
+
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "Base de données des FAX"
+
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "utilisateur de la base de données du FAX"
+
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "administration d'Asterisk"
+
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Utilisateur de la base de données Asterisk"
+
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Préfixe du pays"
+
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Préfixe local"
+
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "Accès administrateur IMAP"
+
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Identifiant du serveur"
+
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "URL de connexion"
+
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "port Sieve"
+
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Base de données des logs"
+
+#: plugins/admin/systems/servdb.tpl:104
+msgid "Logging DB user"
+msgstr "Utilisateur de la base de données de log"
+
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nom de la machine"
+
+#: 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/headpage.tpl:6
+msgid "List of systems"
+msgstr "Liste des systèmes"
+
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Ce menu permet d'ajouter, de supprimer ou de changer les propriétés des "
+"systèmes. Vous pouvez seulement ajouter un système qui à déjà été démarré "
+"une fois."
+
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr "Sélectionnez pour voir les serveurs"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Modèle de station de travail"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Afficher les serveurs"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nom de la station de travail"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Sélectionnez pour afficher les terminaux Linux"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Accès kadmin Kerberos"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Afficher les terminaux"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Realm Kerberos"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Sélectionnez pour voir les stations de travail Linux"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Administrateur"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Afficher les stations de travail"
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "Base de données des FAX"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "utilisateur de la base de données du FAX"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Afficher les stations de travail Windows"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "administration d'Asterisk"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Sélectionnez pour afficher les imprimantes réseaux"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Utilisateur de la base de données Asterisk"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Afficher les imprimantes réseaux"
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Préfixe du pays"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Sélectionnez pour afficher les téléphones IP"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Préfixe local"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Afficher les téléphones"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "Accès administrateur IMAP"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Sélectionnez pour afficher les périphériques réseaux"
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Identifiant du serveur"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Montrer les périphériques réseau"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "URL de connexion"
+#: 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/servdb.tpl:91
-msgid "Sieve port"
-msgstr "port Sieve"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
+msgstr "Afficher les systèmes de l'utilisateur"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Base de données des logs"
+#: 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/servdb.tpl:104
-msgid "Logging DB user"
-msgstr "Utilisateur de la base de données de log"
+#: 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 ""
+"Cela inclut <b>tout</b> les systèmes et les informations de configuration. "
+"Veuillez vérifier que vous voulez effectuer cette opération, il est "
+"impossible de revenir en arrière. Toutes les données seront perdues étant "
+"donné qu'il est impossible pour GOsa de récupérer vos données."
 
 #: plugins/admin/systems/class_servKolab.inc:112
 msgid "Remove Kolab extension"
@@ -5218,186 +5430,108 @@ msgstr "pas de r
 msgid "No SMTP smarthost/relayhost set."
 msgstr "Pas de relais SMTP indiqué."
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "Service POP3"
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "Service POP3/SSL"
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "Service IMAP"
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "Service IMAP/SSL"
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Service sieve"
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-"service des options de disponibilités par FTP (ancien, pas compatible avec "
-"les options de disponibilités de Kolab2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Service d'option de disponibilité par HTTP (ancien)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Scan des messages par Amavis (virus/spam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Préférences des quotas"
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Préférences des options de disponibilités"
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
-"Permettre le téléchargement des informations de disponibilités de manière "
-"anonyme"
-
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "Réseaux SMTP privilègiés"
-
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Machines/Réseaux qui peuvent relayer du mail"
-
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr "Entrez des valeurs multiples, séparés avec"
-
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "Relais SMTP"
-
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Vérification de l'enregistrement MX pour le serveur relais"
-
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Machine utilisée pour relayer les mails"
-
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Accepter le courrier électronique venant d'internet"
-
-#: 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/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nom de la machine"
+#: 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/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."
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
-"Cela inclut <b>tout</b> les systèmes et les informations de configuration. "
-"Veuillez vérifier que vous voulez effectuer cette opération, il est "
-"impossible de revenir en arrière. Toutes les données seront perdues étant "
-"donné qu'il est impossible pour GOsa de récupérer vos données."
+"Vous n'avez pas l'autorisation de créer une imprimante sur cette 'Base'."
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Liste des systèmes"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
+msgstr "Configuration particulière du téléphone"
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Ce menu permet d'ajouter, de supprimer ou de changer les propriétés des "
-"systèmes. Vous pouvez seulement ajouter un système qui à déjà été démarré "
-"une fois."
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
+msgstr "Type de téléphone"
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "Sélectionnez pour voir les serveurs"
+#: 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/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Afficher les serveurs"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
+msgstr "Rafraichir"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Sélectionnez pour afficher les terminaux Linux"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
+msgstr "Mode DTMF"
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Afficher les terminaux"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
+msgstr "Adresse ip par défaut"
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Sélectionnez pour voir les stations de travail Linux"
+#: 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/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Afficher les stations de travail"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr "Moins"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Sélectionnez afin de voir les stations de travail Microsoft Windows"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr "Type d'authentification"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Afficher les stations de travail Windows"
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
+msgstr "Secret"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Sélectionnez pour afficher les imprimantes réseaux"
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr "mot de passe utilisé pour l'authentification rsa"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Afficher les imprimantes réseaux"
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr "mot de passe utilisé pour l'authentification rsa"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Sélectionnez pour afficher les téléphones IP"
+#: plugins/admin/systems/phonesettings.tpl:150
+msgid "Account code"
+msgstr "Code du compte téléphonique"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Afficher les téléphones"
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
+msgstr "Regrouper des lignes"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Sélectionnez pour afficher les périphériques réseaux"
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
+msgstr "Machines qui peuvent se connecter"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Montrer les périphériques réseau"
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr "Machines qui peuvent pas se connecter"
 
-#: 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/phonesettings.tpl:210
+msgid "MSN"
+msgstr "MSN"
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
-msgstr "Afficher les systèmes de l'utilisateur"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+"Utilisez le champ suivant afin de changer le mot de passe root du terminal. "
+"La modification sera prise en compte lors du prochain redémarrage du "
+"terminal. Veuillez retenir le mot de passe car sans celui-ci il vous sera "
+"impossible de vous authentifier. <b>le champ vide entraîne la mise en place "
+"du mot de passe par défaut</b>"
 
-#: 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/password.tpl:6
+msgid "Changing the password impinges on authentification only."
+msgstr "Changer le mot de passe influe seulement sur l'identification."
 
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
@@ -5564,23 +5698,6 @@ msgstr "Fournir des services de scanner"
 msgid "Select scanner driver to use"
 msgstr "Sélectionnez le pilote du scanner"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-"Utilisez le champ suivant afin de changer le mot de passe root du terminal. "
-"La modification sera prise en compte lors du prochain redémarrage du "
-"terminal. Veuillez retenir le mot de passe car sans celui-ci il vous sera "
-"impossible de vous authentifier. <b>le champ vide entraîne la mise en place "
-"du mot de passe par défaut</b>"
-
-#: plugins/admin/systems/password.tpl:6
-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."
@@ -5712,7 +5829,8 @@ 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"
@@ -5753,7 +5871,9 @@ msgstr "Configuration r
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
-msgstr "Impossible d'effacer ce téléphone parce que certains utilisateurs l'utilisent. Un de ces utilisateur est '%s'."
+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."
@@ -5771,90 +5891,89 @@ 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/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/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+"Toutes les actions qui sont possibles ici influencent <b> toutes</b> les "
+"machines dans ce groupe d'objets. N'oubliez pas que redémarrer les machines "
+"des personnes qui y travaillent peuvent les rendre mécontents."
 
-#: 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/termgroup.tpl:7
+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/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr "Rafraichir"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "Liste de dsitribution"
 
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr "Mode DTMF"
+#: 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:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr "Adresse ip par défaut"
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminaux"
 
-#: 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/tabs_ogroups.inc:37
+msgid "Phone queue"
+msgstr "Queue téléphonique"
 
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr "Moins"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or 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/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr "Type d'authentification"
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Afficher les groupes contenant des utilisateurs"
 
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
-msgstr "Secret"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Afficher les groupes contenant des groupes"
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr "mot de passe utilisé pour l'authentification rsa"
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Afficher les groupes contenant des applications"
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr "mot de passe utilisé pour l'authentification rsa"
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Afficher les groupes contenant des départements"
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
-msgstr "Code du compte téléphonique"
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Afficher les groupes contenant des serveurs"
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr "Regrouper des lignes"
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Afficher les groupes contenant des stations de travail"
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr "Machines qui peuvent se connecter"
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Afficher les groupes contenant des terminaux"
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr "Machines qui peuvent pas se connecter"
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Afficher les groupes contenant des imprimantes"
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr "MSN"
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Display object groups matching"
+msgstr "Afficher les groupes d'objets correspondants"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminaux"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Nom du groupe"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
-msgstr "Queue téléphonique"
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Objets membres"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -5924,82 +6043,8 @@ msgstr "Afficher les objets correspondants"
 msgid "Regular expression for matching object names"
 msgstr "Expression régulière pour trouver les objets correspondants"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-"Toutes les actions qui sont possibles ici influencent <b> toutes</b> les "
-"machines dans ce groupe d'objets. N'oubliez pas que redémarrer les machines "
-"des personnes qui y travaillent peuvent les rendre mécontents."
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-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_ogroup.inc:95
-msgid "This 'dn' is no object group."
-msgstr "Ce 'dn' n'est pas un groupe objet."
-
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "too many different objects!"
-msgstr "nombre d'objets différents trop important!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "users"
-msgstr "utilisateurs"
-
-#: plugins/admin/ogroups/class_ogroup.inc:206
-msgid "groups"
-msgstr "groupes"
-
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "applications"
-msgstr "applications"
-
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "departments"
-msgstr "départements"
-
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "servers"
-msgstr "serveurs"
-
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "workstations"
-msgstr "stations de travail"
-
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "terminals"
-msgstr "terminaux"
-
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "phones"
-msgstr "téléphones"
-
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "printers"
-msgstr "imprimantes"
-
-#: plugins/admin/ogroups/class_ogroup.inc:220
-msgid "and"
-msgstr "et"
-
-#: plugins/admin/ogroups/class_ogroup.inc:371
-msgid "Non existing dn: "
-msgstr "le dn suivant n'existe pas : "
-
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr "Les groupes objets doivent avoir au minimum un membre!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:507
-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
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
@@ -6047,204 +6092,74 @@ msgstr "Groupes d'objets"
 msgid "Group"
 msgstr "Groupes"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Nom du groupe"
-
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Objets membres"
-
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données "
-"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
-"données."
-
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or 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/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Afficher les groupes contenant des utilisateurs"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Afficher les groupes contenant des groupes"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Afficher les groupes contenant des applications"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Afficher les groupes contenant des départements"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Afficher les groupes contenant des serveurs"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Afficher les groupes contenant des stations de travail"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Afficher les groupes contenant des terminaux"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Afficher les groupes contenant des imprimantes"
-
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
-msgstr "Afficher les groupes d'objets correspondants"
-
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "Liste de dsitribution"
-
-#: 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/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/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/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_ogroup.inc:95
+msgid "This 'dn' is no object group."
+msgstr "Ce 'dn' n'est pas un groupe objet."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-#, fuzzy
-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/class_ogroup.inc:203
+msgid "too many different objects!"
+msgstr "nombre d'objets différents trop important!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-#, fuzzy
-msgid "take turns ringing each available interface"
-msgstr "faire sonner les interfaces disponibles tour à tour"
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr "utilisateurs"
 
-#: 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/class_ogroup.inc:206
+msgid "groups"
+msgstr "groupes"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
-#, fuzzy
-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/class_ogroup.inc:207
+msgid "applications"
+msgstr "applications"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr "Faire sonner un interface de manière aléatoire"
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "departments"
+msgstr "départements"
 
-#: 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_ogroup.inc:209
+msgid "servers"
+msgstr "serveurs"
 
-#: 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/class_ogroup.inc:210
+msgid "workstations"
+msgstr "stations de travail"
 
-#: 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/class_ogroup.inc:211
+msgid "terminals"
+msgstr "terminaux"
 
-#: 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_ogroup.inc:212
+msgid "phones"
+msgstr "téléphones"
 
-#: 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_ogroup.inc:213
+msgid "printers"
+msgstr "imprimantes"
 
-#: 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_ogroup.inc:220
+msgid "and"
+msgstr "et"
 
-#: 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_ogroup.inc:371
+msgid "Non existing dn: "
+msgstr "le dn suivant n'existe pas : "
 
-#: 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_ogroup.inc:502
+msgid "Object groups need at least one member!"
+msgstr "Les groupes objets doivent avoir au minimum un membre!"
 
-#: 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_ogroup.inc:507
+msgid "You can combine two different object types at maximum only!"
+msgstr "Vous pouvez combiner au maximum deux objets différents !"
 
-#: 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/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Veuillez vérifier que vous voulez effectuer cette action. Toutes les données "
+"seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
+"données."
 
 #: plugins/admin/ogroups/phonequeue.tpl:1
 msgid "Queue Settings"
@@ -6365,190 +6280,227 @@ msgstr ""
 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/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/gofon/phoneaccount/class_phoneAccount.inc:104
-msgid "no macro"
-msgstr "pas de macros"
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:121
-msgid "undefined"
-msgstr "non défini"
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:468
-msgid "Error while performing query "
-msgstr "Une erreur s'est produite lors de la requête "
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:512
+#: 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 ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
-"La macro que vous aviez choisi dans le passé n'est plus disponible, veuillez "
-"en choisir une autre."
+"Les queues téléphoniques sont désactivées pour ce groupe. Vous pouvez les "
+"activer en cliquant sur le bouton ci-dessous."
 
-#: 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/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
+msgstr "Uruguay"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
-msgid "Remove phone account"
-msgstr "Supprimer l'extension téléphonique"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
+msgstr "Non"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "Yes"
+msgstr "Oui"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:136
+#, fuzzy
+msgid "ring all available channels until one answers"
 msgstr ""
-"Une extension téléphone existe pour cet utilisateur. Vous pouvez la "
-"supprimer en cliquant sur le bouton ci-dessous."
+"faire sonner tout les canaux disponibles jusqu'à ce que l'un deux réponde"
 
-#: 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:137
+#, fuzzy
+msgid "take turns ringing each available interface"
+msgstr "faire sonner les interfaces disponibles tour à tour"
 
-#: 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 "Aucun extension téléphone n'existe pour cet utilisateur. Vous ne pouvez pas l'activer lorsque aucun uid n'est indiqué."
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:628
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+#, fuzzy
+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/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr "Faire sonner un interface de manière aléatoire"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
 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: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:178
+msgid "Timeout must be numeric"
+msgstr "Le délai d'attente doit être un chiffre"
 
-#: 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:181
+msgid "Retry must be numeric"
+msgstr "Le délai de rappel automatique doit être un chiffre"
 
-#: 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:184
+msgid "Max queue length must be numeric"
+msgstr "La taille maximale de la queue doit être numérique"
 
-#: 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:187
+#, fuzzy
+msgid "Announce frequency must be numeric"
+msgstr "La fréquence du message d'annonce doit être numérique"
 
-#: 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: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/gofon/phoneaccount/class_phoneAccount.inc:829
+#: plugins/admin/ogroups/class_phonequeue.inc:213
+#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #, php-format
-msgid "The given PIN is too short"
-msgstr "Le code PIN est trop petit"
+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/class_phoneAccount.inc:844
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
 #, 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!"
+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/class_phoneAccount.inc:847
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:446
+#: plugins/admin/ogroups/class_phonequeue.inc:594
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "La valeur d'attente'%s' contient des caractères invalides!"
+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/gofon/phoneaccount/class_phoneAccount.inc:855
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: 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 parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr ""
-"Le paramètre %s contient des caractères invalides. '!#' est utilisé comme "
-"séparateur"
+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/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
-msgstr "Arrêter"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Liste des macros"
 
-#: 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/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/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Numéros de téléphones"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Afficher les macros correspondant à"
+
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Afficher les macros correspondantes"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Transférer les appels vers"
+#: 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/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Numéros de téléphone"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Nom de la macro"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Temps d'attente(s)"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "Nom d'affichage de la macro"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
-msgid "Phone macro"
-msgstr "Macro téléphoniques"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Sélectionnez la branche où sera placée la macro"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "fill out"
-msgstr "remplir"
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr "Visible pour l'utilisateur"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
-msgstr "Code PIN du téléphone"
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Texte de la macro"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Rapports téléphoniques"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr "Macros téléphoniques"
 
-#: 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: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: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: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: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:328
+msgid "Create new phone macro"
+msgstr "Créer une nouvelle macro téléphonique"
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Emetteur"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
+msgstr "Visible"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Destinataire"
+#: 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:33
-msgid "Channel"
-msgstr "Canal"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
+msgstr "macro"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Durée"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
+msgstr "visible"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Rapports téléphoniques"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
+msgstr "invisible"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6614,136 +6566,241 @@ msgstr "La longueur de la macro doit 
 msgid "Please choose a valid  base."
 msgstr "Veuillez choisir une base valide."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Nom de la macro"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "Nom d'affichage de la macro"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "type"
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Sélectionnez la branche où sera placée la macro"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
+msgstr "Chaîne de caractère"
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Visible pour l'utilisateur"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
+msgstr "Boite à choix multiple"
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Texte de la macro"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr "Booléen"
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Liste des macros"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
+msgstr "Supprimer les paramètres inutilisés"
 
-#: plugins/gofon/macro/headpage.tpl:24
+#: 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:855
+#, 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 ""
-"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."
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 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."
+"Le nombre de paramètres de la macro à change, vous devez mettre à jour "
+"chaque utilisateur qui utilise la macro '%s'."
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Afficher les macros correspondant à"
+#: 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/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Afficher les macros correspondantes"
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Numéros de téléphones"
 
-#: 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/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/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
+msgstr "Macro téléphoniques"
+
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "fill out"
+msgstr "remplir"
+
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
+msgstr "Code PIN 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/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/gofon/phoneaccount/class_phoneAccount.inc:621
+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/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/gofon/phoneaccount/class_phoneAccount.inc:625
+msgid ""
+"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/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:641
+msgid "Please enter a valid phone number!"
+msgstr "Veuillez entrer un numéro de téléphone valide!"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
-msgstr "Chaîne de caractère"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Choisissez votre téléphone privé"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
-msgstr "Boite à choix multiple"
+#: 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/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
-msgstr "Booléen"
+#: 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/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
-msgstr "Supprimer les paramètres inutilisés"
+#: 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/gofon/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, 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."
+msgid "The given PIN is too short"
+msgstr "Le code PIN est trop petit"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, 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."
+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:363
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, 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'."
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "La valeur d'attente'%s' contient des caractères invalides!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
-msgstr "Macros téléphoniques"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
+msgstr "Arrêter"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Vous êtes sur le point de supprimer la macro '%s'."
+msgid "Removed user '%s' from phone queue '%s'."
+msgstr "L'utilisateur '%s' à été enlevé de la queue '%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 "Vous n'êtes pas autorisé à supprimer cette macro!"
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr "Configuration du téléphone"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
-msgstr "Créer une nouvelle macro téléphonique"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Rapports téléphoniques"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
-msgstr "Visible"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Rapports téléphoniques"
 
-#: 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/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:378
-msgid "Macro"
-msgstr "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:379
-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:380
-msgid "invisible"
-msgstr "invisible"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Emetteur"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Destinataire"
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "type"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Durée"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6789,13 +6846,41 @@ 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 ""
 "La création de cette page à occasionné des erreurs d'après l'interpréteur "
 "PHP!"
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr "Afficher/Cacher l'information"
 
@@ -6877,7 +6962,8 @@ 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 ""
@@ -6968,7 +7054,8 @@ 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
@@ -7012,25 +7099,8 @@ msgstr "Impossible d'envoyer un script 
 #: 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?"
+"Impossible d'activer les scripts sieve de GOsa. Le serveur indique '%s'."
 
 #: include/class_plugin.inc:180
 msgid "This 'dn' has no account extensions."
@@ -7042,148 +7112,65 @@ msgstr "Cette extension est vide."
 
 #: include/class_plugin.inc:398
 #, php-format
-msgid "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
 "pas."
 
 #: 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."
+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_plugin.inc:454
 #, php-format
-msgid "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+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_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-ssha.inc:51
 msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 "Impossible d'utiliser ssha pour l'encryption (Fonction mhash / sha1 "
-"manquante)"
-
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-"La modification a échoué du mot de passe à échoué. Le serveur LDAP indique '%"
-"s'."
-
-#: include/class_password-methods.inc:202
-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_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/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 ""
-"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"
-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."
+"manquante)"
 
-#: include/class_ldap.inc:700
+#: include/class_password-methods.inc:165
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
-"Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
-"votre fichier LDIF à partir de la ligne %s!"
+"La modification a échoué du mot de passe à échoué. Le serveur LDAP indique '%"
+"s'."
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 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"
+"La configuration de SMBHASH dans gosa.conf est incorrecte ! Impossible de "
+"changer le mot de passe Samba."
 
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 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"
+"Votre fichier de configuration gosa.conf à changé partiellement . Veuillez "
+"le convertir en utilisant le script fix_config.sh!"
 
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr "%s%% trouvés dans le fichier %s"
+#: 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/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7208,7 +7195,8 @@ 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"
@@ -7262,7 +7250,8 @@ 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"
@@ -7337,7 +7326,8 @@ 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"
@@ -7450,7 +7440,8 @@ 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
@@ -7495,7 +7486,8 @@ 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 ""
@@ -7641,6 +7633,83 @@ 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"
+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!"
+
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr "L'aide n'est pas accessible si vous n'êtes pas connectés."
@@ -7655,11 +7724,17 @@ 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."
 
+#: 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!"
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Impossible de se connecter au serveur de base de données!"
@@ -7672,10 +7747,6 @@ msgstr "Impossible de s
 msgid "Database query failed!"
 msgstr "Echec des requêtes sur la base de données!"
 
-#: 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!"
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7685,7 +7756,7 @@ 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
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -7693,19 +7764,20 @@ 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
+#: html/main.php:155
 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
+#: html/main.php:284
 #, 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!"
+#: html/main.php:313
+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!"
@@ -7731,7 +7803,8 @@ 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."
@@ -7789,6 +7862,25 @@ msgstr ""
 "au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
 "restreindre les données a visualiser"
 
+#: 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 ""
+"Veuillez utiliser votre <i>nom d'utilisateur</i> et votre <i>mot de passe</"
+"i> afin de vous connecter"
+
+#: 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 "Répertoire"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Connexion"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Cliquez ici pour vous connecter"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Conflit détecté entre différentes sessions"
@@ -7818,25 +7910,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: 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 ""
-"Veuillez utiliser votre <i>nom d'utilisateur</i> et votre <i>mot de passe</"
-"i> afin de vous connecter"
-
-#: 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 "Répertoire"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Connexion"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Cliquez ici pour vous connecter"
-
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7859,6 +7932,24 @@ msgstr ""
 "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/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7879,24 +7970,6 @@ 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é"
@@ -7912,23 +7985,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_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: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:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 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."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 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."
+"La seconde étape vérifie la présence de programmes complémentaires ainsi que "
+"leur numéro de version minimale."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
@@ -8164,4 +8237,3 @@ msgstr ""
 "GOsa peut provoquer des erreurs PHP, particulièrement dans le cas des Beta "
 "versions. Dans certains cas il peut être intéressant d'activer l'affichage "
 "des erreurs. (Cela peut représenter un risque de sécurité)  "
-

diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po
index 6d518e97b8a86551da9da18645920336a4fe7390..2a511c1a3fd4cf3fd5ae26fed92ec1582538dc66 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -150,9 +150,9 @@ msgid "Export"
 msgstr "Esporta"
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr "Importa"
 
@@ -192,149 +192,140 @@ 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/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Seleziona gli indirizzi da aggiungere"
 
-#: 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/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Filtri"
 
-#: 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/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostra l'indirizzo del dipartimento"
 
-#: 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/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Scegli il dipartimento di base per la ricerca"
 
-#: 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/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Mostra gli indirizzi che corrispondono"
 
-#: 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/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Espressione regolare per selezionare l'indirizzo"
 
-#: 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/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Mostra l'indirizzo dell'utente"
 
-#: 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/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 
-#: 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/mail_locals.tpl:41
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: 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/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
+#: plugins/admin/groups/group_objects.tpl:49
+#: 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/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
+msgid "Add"
+msgstr "Aggiungi"
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
@@ -375,38 +366,6 @@ msgstr "Indirizzi alternativi"
 msgid "List of alternative mail addresses"
 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/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/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
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:49
-#: 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/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:710
-#: plugins/gofon/phoneaccount/generic.tpl:13
-msgid "Add"
-msgstr "Aggiungi"
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
@@ -423,13 +382,13 @@ msgstr "Aggiungi"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: 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/remove.tpl:15
 #: 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/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr "Rimuovi"
 
@@ -518,9 +477,8 @@ msgid "disables all Mail options!"
 msgstr "disabilita tutte le opzioni di posta!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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
@@ -530,52 +488,11 @@ msgstr "disabilita tutte le opzioni di posta!"
 #: 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
+#: 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/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
 #: plugins/personal/connectivity/main.inc:126
@@ -600,119 +517,190 @@ msgstr "Modifica"
 msgid "User mail settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Seleziona gli indirizzi da aggiungere"
+#: 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/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
-msgstr "Filtri"
+#: 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/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostra l'indirizzo del dipartimento"
+#: 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/mail_locals.tpl:27
-#: 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
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Scegli il dipartimento di base per la ricerca"
+#: 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/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Mostra gli indirizzi che corrispondono"
+#: 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/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-msgstr "Espressione regolare per selezionare l'indirizzo"
+#: 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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-msgstr "Mostra l'indirizzo dell'utente"
+#: 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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-msgstr "Nome dell'utente del quale mostrare gli indirizzi"
+#: 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/password/class_password.inc:5
-#: 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 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/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/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/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
-msgid "Change password"
-msgstr "Cambia la password"
+#: 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/password/password.tpl:6
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
 msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
 msgstr ""
-"Per cambiare la tua password usa i campi qui sotto. I cambiamenti avrenno "
-"effetto immediatamente. Memorizza la nuova password perché non sarai in "
-"grado di connetterti senza di essa."
+"Stai cercando di aggungere un indirizzo di posta non valido alla lista degli "
+"indirizzi alternativi."
 
-#: plugins/personal/password/password.tpl:10
-#: plugins/admin/users/password.tpl:6
+#: 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 ""
-"Changing the password affects your authentification on mail, proxy, samba "
-"and unix services."
+"There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
-"Cambiare la passord influisce sull'autenticazione su posta, proxu Internet, "
-"Samba e Unix."
-
-#: plugins/personal/password/password.tpl:15
-msgid "Current password"
-msgstr "Password attuale"
 
-#: plugins/personal/password/password.tpl:20
-#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:11
-msgid "New password"
-msgstr "Nuova password"
+#: 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/password/password.tpl:25
-#: plugins/personal/generic/password.tpl:11
-#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
-msgid "Repeat new password"
-msgstr "Ripeti la password"
+#: 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/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:659
+msgid "Change password"
+msgstr "Cambia la password"
+
+#: plugins/personal/password/password.tpl:6
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
+msgstr ""
+"Per cambiare la tua password usa i campi qui sotto. I cambiamenti avrenno "
+"effetto immediatamente. Memorizza la nuova password perché non sarai in "
+"grado di connetterti senza di essa."
+
+#: plugins/personal/password/password.tpl:10
+#: plugins/admin/users/password.tpl:6
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
+msgstr ""
+"Cambiare la passord influisce sull'autenticazione su posta, proxu Internet, "
+"Samba e Unix."
+
+#: plugins/personal/password/password.tpl:15
+msgid "Current password"
+msgstr "Password attuale"
+
+#: plugins/personal/password/password.tpl:20
+#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
+#: plugins/admin/systems/password.tpl:11
+msgid "New password"
+msgstr "Nuova password"
+
+#: plugins/personal/password/password.tpl:25
+#: plugins/personal/generic/password.tpl:11
+#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
+msgid "Repeat new password"
+msgstr "Ripeti la password"
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
@@ -734,11 +722,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -750,6 +738,18 @@ msgstr ""
 msgid "Back"
 msgstr "Indietro"
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "Password"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -789,18 +789,64 @@ 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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr "Home directory"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostra i sistemi del dipartimento"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: 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/generic.tpl:21
+msgid "Primary group"
+msgstr "Gruppo primario"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Stato"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Forza UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Gruppi di appartenenza"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Attenzione: L'NFS non supporta più di 16 gruppi!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Sicurezza"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Ambiente"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Stampante predefinita"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Lingua predefinita"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "Accesso ai sistemi"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -890,64 +936,18 @@ msgstr "L'utente deve cambiare la password alla prima connessione"
 msgid "Password expires on"
 msgstr "La password spira il"
 
-#: 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
-msgid "Home directory"
-msgstr "Home directory"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Gruppo primario"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Stato"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Forza UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Gruppi di appartenenza"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Attenzione: L'NFS non supporta più di 16 gruppi!)"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Sicurezza"
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Ambiente"
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr "Stampante predefinita"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleziona un sistema da aggiungere"
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "Lingua predefinita"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostra i sistemi del dipartimento"
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "Accesso ai sistemi"
+#: 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/main.inc:131
 msgid "Unix settings"
@@ -1624,15 +1624,6 @@ msgstr ""
 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"
@@ -1649,8 +1640,8 @@ msgstr "Cambia 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/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Cognome"
@@ -1694,9 +1685,9 @@ msgstr "Sesso"
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1865,6 +1856,15 @@ msgstr "Ultimo recapito"
 msgid "Public visible"
 msgstr "Pubblico"
 
+#: 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_picture.tpl:23
 msgid "Remove picture"
 msgstr "Elimina foto"
@@ -1874,6 +1874,14 @@ msgstr "Elimina foto"
 msgid "Save"
 msgstr "Salva"
 
+#: 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/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificato standard"
@@ -1901,46 +1909,14 @@ msgstr "Certificato PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: 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/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Crea estensioni telefoniche"
 
-#: 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/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr ""
-
-#: plugins/personal/connectivity/proxy.tpl:16
-msgid "Proxy account"
-msgstr "Estenzioni Proxy Internet"
+#: 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)"
@@ -1958,71 +1934,63 @@ msgstr "Restringi la quota d'uso di Internet"
 msgid "per"
 msgstr "per"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "Estenzioni FTP"
 
-#: 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/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr "Banda"
 
-#: 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/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Banda di upload"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "kb/s"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Banda di download"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
+msgstr "Quota"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "File"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Manuale"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Dimensione"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anonimo"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr "Rapporto"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "File in upload / File in download"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Seleziona per disabilitale l'accesso FTP"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Disabilita temporaneamente l'accesso FTP"
 
-#: 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/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "Estenzioni PHPGroupware"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "Estenzioni PHPGroupware"
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Account Kolab"
@@ -2067,177 +2035,255 @@ msgstr "giorni"
 msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Estenzioni WebDAV"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
+msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
-msgstr "Open-Xchange"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
+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."
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
 msgstr ""
-"Questa identità non possiede estensioni Samba. Per poterle creare occorre "
-"creare prima le estensioni Unix."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr ""
+
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "KB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "GB"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "hour"
+msgstr "ora"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "day"
+msgstr "giorno"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "week"
+msgstr "settimana"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "month"
+msgstr "mese"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:131
 #, fuzzy
-msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
+msgid "Numerical value for Quota Setting is not valid."
+msgstr "Il valore di 'Dimensione quota' non è valido"
+
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Estenzioni WebDAV"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
 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"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
+#: 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/pureftpd.tpl:1
-msgid "FTP account"
-msgstr "Estenzioni FTP"
+#: 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/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Banda"
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Banda di upload"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "kb/s"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Banda di download"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Quota"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
+msgstr "Manuale"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "File"
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
+msgstr "Anonimo"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
-msgstr "Dimensione"
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
+msgid "The value specified as Free Busy future needs to be an integer."
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Rapporto"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "File in upload / File in download"
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#, php-format
+msgid "The invitation policy entry for address '%s' is not valid."
+msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Seleziona per disabilitale l'accesso FTP"
+#: 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/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Disabilita temporaneamente l'accesso FTP"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
+#: 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/oxchange.tpl:21
-msgid "Task Days"
+#: 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/oxchange.tpl:33
-msgid "User Information"
+#: 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/oxchange.tpl:37
-msgid "User Timezone"
+#: 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/intranet.tpl:1
-#, fuzzy
-msgid "Intranet account"
-msgstr "Crea estensioni telefoniche"
+#: 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/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
-msgstr "Proxy"
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Lista delle liste di blocchi"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "KB"
-msgstr ""
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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_proxyAccount.inc:76
-msgid "GB"
+#: plugins/gofax/blocklists/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "hour"
-msgstr "ora"
-
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "day"
-msgstr "giorno"
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
-msgstr "settimana"
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
-msgstr "mese"
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-#, fuzzy
-msgid "Numerical value for Quota Setting is not valid."
-msgstr "Il valore di 'Dimensione quota' non è valido"
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -2282,17 +2328,6 @@ msgstr ""
 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 ""
@@ -2546,41 +2581,6 @@ msgstr ""
 "Quindi - Se sei sicuro - premi <i>Rimuovi</i> per continuare o <i>Annulla</"
 "i> per abortire."
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Lista delle liste di blocchi"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr ""
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr ""
@@ -2685,8 +2685,8 @@ msgid "List of predefined blocklists"
 msgstr "Liste di blocco predefinite"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
 msgid "Apply"
 msgstr "Applica"
 
@@ -2751,109 +2751,113 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr ""
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
+msgstr "Filtro"
 
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr ""
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
+msgstr "Cerca"
 
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
+#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+msgid "Enter user name to search for"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
+#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
+#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
+msgid "in"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
+#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
+msgid "Select subtree to base search on"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
+#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
+msgid "during"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr ""
+#: plugins/gofax/reports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
+msgid "Search"
+msgstr "Cerca"
 
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr ""
+#: plugins/gofax/reports/contents.tpl:31
+#: plugins/addons/logview/contents.tpl:84
+#: plugins/gofon/reports/contents.tpl:30
+msgid "Date"
+msgstr "Data"
 
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
+#: plugins/gofax/reports/contents.tpl:33
+msgid "Sender"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
+#: plugins/gofax/reports/contents.tpl:34
+msgid "Receiver"
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
 msgid "# pages"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
-msgstr "Filtro"
+#: plugins/gofax/reports/contents.tpl:47
+#: plugins/addons/logview/contents.tpl:97
+#: plugins/gofon/reports/contents.tpl:48
+msgid "Search returned no results..."
+msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
-msgstr "Cerca"
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
-msgid "Enter user name to search for"
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
-#: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
-msgid "in"
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:9 plugins/gofon/reports/contents.tpl:9
-msgid "Select subtree to base search on"
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:12 plugins/gofon/reports/contents.tpl:12
-msgid "during"
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
-#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-msgid "Search"
-msgstr "Cerca"
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:84
-#: plugins/gofon/reports/contents.tpl:30
-msgid "Date"
-msgstr "Data"
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:33
-msgid "Sender"
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:34
-msgid "Receiver"
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
 msgstr ""
 
-#: plugins/gofax/reports/contents.tpl:47
-#: plugins/addons/logview/contents.tpl:97
-#: plugins/gofon/reports/contents.tpl:48
-msgid "Search returned no results..."
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
 msgstr ""
 
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Rapporti FAX"
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Rapporti FAX"
@@ -2883,10 +2887,6 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Rapporti FAX"
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -2963,6 +2963,13 @@ msgstr ""
 msgid "Dial"
 msgstr ""
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr ""
@@ -3002,13 +3009,6 @@ msgstr "Città"
 msgid "Country"
 msgstr "Paese"
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Rubrica"
@@ -3097,6 +3097,48 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr ""
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr "Amministrazione LDAP"
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3160,11 +3202,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr ""
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
@@ -3177,38 +3214,6 @@ msgstr ""
 msgid "Import successful"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr ""
-
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr ""
@@ -3253,11 +3258,6 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr "Amministrazione LDAP"
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr "Importa da formato CSV"
@@ -3270,6 +3270,42 @@ msgstr ""
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr ""
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr ""
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr ""
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Log di sitema"
@@ -3321,90 +3357,23 @@ msgstr ""
 msgid "one month"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:135
-msgid "Can't connect to log database, no logs can be shown!"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr ""
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr ""
-
-#: plugins/addons/logview/main.inc:23
-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."
+#: plugins/addons/logview/class_logview.inc:135
+msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
+#: 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/mail.tpl:11
 msgid "Primary mail address for this shared folder"
@@ -3430,19 +3399,11 @@ 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
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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 ""
-"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"
@@ -3523,15 +3484,74 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: 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 ""
-"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."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opzioni applicazione"
+#: 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/application.tpl:4
+msgid "Used applications"
+msgstr "Applicazioni in uso"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Modifica parametri"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Modifica parametri opzionali delle applicazioni"
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr "Applicazioni disponibili"
+
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Oggetto"
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Applica questa ACL solo per i campi propri dell'utente"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3580,55 +3600,9 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Oggetto"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Applica questa ACL solo per i campi propri dell'utente"
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Applicazioni in uso"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Modifica parametri"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Modifica parametri opzionali delle applicazioni"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Applicazioni disponibili"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Selezioni utenti da aggiungere"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr "Mostra utenti del dipartimento"
-
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-msgid "Display users matching"
-msgstr "Mostra utenti che corrispondono a"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr "Tutti i campi sono scrivibili"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Amministratori cartella"
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -3676,9 +3650,35 @@ msgstr "I membri sono in un gruppo di risposta telefonica"
 msgid "Group members"
 msgstr "Membri del gruppo"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Amministratori cartella"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Selezioni utenti da aggiungere"
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr "Mostra utenti del dipartimento"
+
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+msgid "Display users matching"
+msgstr "Mostra utenti che corrispondono a"
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+msgstr "Tutti i campi sono scrivibili"
+
+#: 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."
@@ -3717,6 +3717,75 @@ msgstr ""
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Lista degli utenti"
+
+#: plugins/admin/users/headpage.tpl:24
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"Questo menù permette di creare, modificare e cancellare gli utenti "
+"selezionati. Avendo un gran numero di utenti, puoi usare i selettori di "
+"intervalli in cima alla lista degli utenti."
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Seleziona per vedere gli utenti template"
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr "Mostra utenti template"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr "Seleziona per vedere gli utenti funzionali"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Mostra utenti funzionali"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr "Seleziona per vedere gli utenti Unix"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr "Mostra utenti Unix"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr "Seleziona per vedere gli utenti di posta"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Mostra utenti di posta"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr "Seleziona per vedere gli utenti Samba"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Mostra utenti Samba"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr "Seleziona per vedere gli utenti proxy"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Mostra utenti proxy"
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -3724,39 +3793,6 @@ 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"
@@ -3813,8 +3849,8 @@ msgstr "Password"
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: 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
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Nome utente"
 
@@ -3875,74 +3911,58 @@ msgstr "nessuno"
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "Lista degli utenti"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crea un nuovo utente usando i template"
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/users/template.tpl:6
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+"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 ""
-"Questo menù permette di creare, modificare e cancellare gli utenti "
-"selezionati. Avendo un gran numero di utenti, puoi usare i selettori di "
-"intervalli in cima alla lista degli utenti."
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Seleziona per vedere gli utenti template"
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr "Mostra utenti template"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr "Seleziona per vedere gli utenti funzionali"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Mostra utenti funzionali"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Seleziona per vedere gli utenti Unix"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Mostra utenti Unix"
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Seleziona per vedere gli utenti di posta"
+#: 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/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Mostra utenti di posta"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Amministrazione utenti"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Seleziona per vedere gli utenti Samba"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Lista delle applicazioni"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Mostra utenti Samba"
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Seleziona per vedere gli utenti proxy"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
+msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Mostra utenti proxy"
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
+msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -3951,7 +3971,7 @@ msgid "Application name"
 msgstr "Nome applicazione"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -4043,29 +4063,33 @@ msgid ""
 "to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lista delle applicazioni"
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
+msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationGeneric.inc:63
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:159
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationGeneric.inc:240
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/class_applicationGeneric.inc:245
+msgid "Required field 'Name' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:248
+msgid "Required field 'Execute' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:257
+msgid "There's already an application with this 'Name'."
 msgstr ""
 
 #: plugins/admin/applications/class_applicationManagement.inc:247
@@ -4089,28 +4113,23 @@ msgstr "Nuovo"
 msgid "Create new application"
 msgstr "Crea estensioni per le applicazioni"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
-msgid "This 'dn' is no application."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:159
-msgid "The specified picture has not been uploaded correctly."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:240
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr "Lista dei dipartimenti"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:245
-msgid "Required field 'Name' is not filled."
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:248
-msgid "Required field 'Execute' is not filled."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:257
-msgid "There's already an application with this 'Name'."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
@@ -4171,27 +4190,29 @@ msgid ""
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Lista dei dipartimenti"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
+msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
+#: 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/headpage.tpl:42
-msgid "Regular expression for matching department names"
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
+#: 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
@@ -4237,25 +4258,16 @@ 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."
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
@@ -4294,47 +4306,36 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr ""
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-#, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "Il campo necessario 'Home directory' non è vuoto"
-
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -4433,40 +4434,113 @@ msgstr ""
 msgid "GUI"
 msgstr ""
 
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "Il campo necessario 'Home directory' non è vuoto"
+
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+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"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/component.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Scegli il subtree dove mettere i terminali"
+
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
 msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
+#: 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:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Azione"
+
+#: 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_terminalService.inc:83
@@ -4507,47 +4581,10 @@ msgstr ""
 msgid "Please specify a valid HSync range."
 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/server.tpl:6
 msgid "Server name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:15
-#: plugins/admin/systems/component.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Scegli il subtree dove mettere i terminali"
-
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Azione"
-
 #: plugins/admin/systems/server.tpl:42
 msgid "Select action to execute for this server"
 msgstr ""
@@ -4556,68 +4593,28 @@ msgstr ""
 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"
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
+#: plugins/admin/systems/printer.tpl:6
+msgid "Printer name"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
 msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
@@ -4720,25 +4717,13 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Add DHCP service"
-msgstr ""
-
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr ""
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
+msgid "Add DHCP service"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
 #: plugins/admin/systems/class_workstationGeneric.inc:136
@@ -4929,12 +4914,80 @@ msgstr "Terminal Server"
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -4955,14 +5008,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr ""
-
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -5023,233 +5068,282 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: 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_servKolab.inc:115
-msgid "Add Kolab service"
+#: 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_servKolab.inc:115
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: plugins/admin/systems/class_servDB.inc:172
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:149
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Lista dei sistemi"
 
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostra server"
+
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostra terminali"
+
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostra workstation"
+
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Mostra workstation Windows"
+
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Mostra stampanti di rete"
+
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostra telefoni"
+
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Mostra dispositiva di rete"
+
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Mostra l'indirizzo dell'utente"
+
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: 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/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
 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/phonesettings.tpl:9
+#, fuzzy
+msgid "Phone type"
+msgstr "Telefono"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lista dei sistemi"
+#: 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/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostra server"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+#, fuzzy
+msgid "Default IP"
+msgstr "Stampante predefinita"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostra terminali"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostra workstation"
+#: plugins/admin/systems/phonesettings.tpl:121
+#, fuzzy
+msgid "Secret"
+msgstr "Strada"
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Mostra workstation Windows"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Mostra stampanti di rete"
+#: plugins/admin/systems/phonesettings.tpl:150
+#, fuzzy
+msgid "Account code"
+msgstr "Sicurezza"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/phonesettings.tpl:158
+msgid "Trunk lines"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostra telefoni"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/phonesettings.tpl:173
+msgid "Hosts that are allowed to connect"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostra dispositiva di rete"
+#: plugins/admin/systems/phonesettings.tpl:188
+msgid "Hosts that are not allowed to connect"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/phonesettings.tpl:210
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-#, fuzzy
-msgid "Display systems of user"
-msgstr "Mostra l'indirizzo dell'utente"
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:4
@@ -5415,18 +5509,6 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-msgstr ""
-
 #: plugins/admin/systems/class_componentGeneric.inc:113
 #: plugins/admin/systems/class_phoneGeneric.inc:276
 #, fuzzy
@@ -5612,96 +5694,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"
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
 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"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr ""
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminali"
 
-#: plugins/admin/systems/phonesettings.tpl:121
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
 #, fuzzy
-msgid "Secret"
-msgstr "Strada"
+msgid "Phone queue"
+msgstr "Numero di telefono"
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or 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/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Mostra gruppi che contengono utenti"
 
-#: plugins/admin/systems/phonesettings.tpl:150
-#, fuzzy
-msgid "Account code"
-msgstr "Sicurezza"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Mostra gruppi che contengono gruppi"
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Mostra gruppi che contengono applicazioni"
+
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Mostra gruppi che contengono dipartimenti"
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Mostra gruppi che contengono server"
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Mostra gruppi che contengono workstation"
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Mostra gruppi che contengono terminali"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminali"
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Mostra gruppi che contengono stampanti"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
-msgid "Phone queue"
-msgstr "Numero di telefono"
+msgid "Display object groups matching"
+msgstr "Mosra gruppi corrispondenti a"
+
+#: 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/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -5771,79 +5845,8 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:95
-msgid "This 'dn' is no object group."
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "too many different objects!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "users"
-msgstr "utenti"
-
-#: plugins/admin/ogroups/class_ogroup.inc:206
-msgid "groups"
-msgstr "gruppi"
-
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "applications"
-msgstr "applicazioni"
-
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "departments"
-msgstr "dipartimenti"
-
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "servers"
-msgstr "server"
-
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "workstations"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "terminals"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "phones"
-msgstr "telefoni"
-
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "printers"
-msgstr "stampanti"
-
-#: plugins/admin/ogroups/class_ogroup.inc:220
-msgid "and"
-msgstr "e"
-
-#: plugins/admin/ogroups/class_ogroup.inc:371
-msgid "Non existing dn: "
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:507
-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
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
 
@@ -5893,200 +5896,70 @@ msgstr "Gruppo di oggetti"
 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 ""
-"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/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or 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/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Mostra gruppi che contengono utenti"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Mostra gruppi che contengono gruppi"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Mostra gruppi che contengono applicazioni"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Mostra gruppi che contengono dipartimenti"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Mostra gruppi che contengono server"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Mostra gruppi che contengono workstation"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Mostra gruppi che contengono terminali"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Mostra gruppi che contengono stampanti"
-
-#: 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"
+#: plugins/admin/ogroups/class_ogroup.inc:95
+msgid "This 'dn' is no object group."
 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"
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-msgid "No"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr "utenti"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:135
-#, fuzzy
-msgid "Yes"
-msgstr "Sistemi"
+#: plugins/admin/ogroups/class_ogroup.inc:206
+msgid "groups"
+msgstr "gruppi"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "applications"
+msgstr "applicazioni"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "departments"
+msgstr "dipartimenti"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:209
+msgid "servers"
+msgstr "server"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
+#: plugins/admin/ogroups/class_ogroup.inc:210
+msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "terminals"
 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_ogroup.inc:212
+msgid "phones"
+msgstr "telefoni"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
-msgid "Timeout must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "printers"
+msgstr "stampanti"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:220
+msgid "and"
+msgstr "e"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
-msgid "Max queue length must be numeric"
+#: plugins/admin/ogroups/class_ogroup.inc:371
+msgid "Non existing dn: "
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
-msgid "Announce frequency must be numeric"
+#: plugins/admin/ogroups/class_ogroup.inc:502
+msgid "Object groups need at least one member!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
-msgid "There must be least one queue number defined."
+#: plugins/admin/ogroups/class_ogroup.inc:507
+msgid "You can combine two different object types at maximum only!"
 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
+#: plugins/admin/ogroups/remove.tpl:7
 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'."
+"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/ogroups/phonequeue.tpl:1
@@ -6216,184 +6089,232 @@ msgstr ""
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 #, fuzzy
-msgid "no macro"
-msgstr "Rapporti telefono"
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr "Questa identià possiede estensioni di posta."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 #, 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 ""
-"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"
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr "Questa identità non possiede estensioni di posta."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
-msgid "Remove phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "Remove the phone queue from this Account"
 msgstr "Elimina estensioni telefoniche"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+#, fuzzy
 msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr "Questa identià possiede estensioni telefoniche."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
-msgid "Create phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid "Create phone queue"
 msgstr "Crea estensioni telefoniche"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
 msgid ""
-"This account has phone features disabled. You can't enable them while no uid "
-"is set."
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr "Questa identità non possiede estensioni telefoniche"
 
-#: 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:134
+msgid "Uruguai"
+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:135
+msgid "No"
+msgstr ""
 
-#: 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:135
+#, fuzzy
+msgid "Yes"
+msgstr "Sistemi"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
-#, php-format
-msgid "You need to specify at least one phone number!"
+#: plugins/admin/ogroups/class_phonequeue.inc:136
+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."
+#: plugins/admin/ogroups/class_phonequeue.inc:137
+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."
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+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"
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+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!"
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
-#, php-format
-msgid "The timeout '%s' contains invalid characters!"
+#: plugins/admin/ogroups/class_phonequeue.inc:141
+msgid "round robin with memory, remember where we left off last ring pass"
 msgstr ""
 
-#: 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"
+#: plugins/admin/ogroups/class_phonequeue.inc:178
+msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
+#: plugins/admin/ogroups/class_phonequeue.inc:181
+msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#: 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/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
 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:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#, 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/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista dei gruppi"
+
+#: 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 ""
+"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/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/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Inoltra chiamate a"
+#: plugins/gofon/macro/headpage.tpl:41
+#, fuzzy
+msgid "Regular expression for matching macro names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Numero di telefono"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#, fuzzy
+msgid "Macro name"
+msgstr "Nome gruppo"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Timeout"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/macro/generic.tpl:22
 #, fuzzy
-msgid "Phone macro"
-msgstr "Rapporti telefono"
+msgid "Choose subtree to place macro in"
+msgstr "Scegli il subtree dove mettere il gruppo"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/macro/generic.tpl:43
 #, fuzzy
-msgid "fill out"
-msgstr "Termina la sessione"
+msgid "Visible for user"
+msgstr "Lista degli utenti"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/macro/generic.tpl:52
 #, fuzzy
-msgid "Phone PIN"
-msgstr "Telefono"
+msgid "Macro text"
+msgstr "Nome gruppo"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
 msgstr "Rapporti telefono"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
+#: 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:154
-msgid "Query for phone database failed!"
-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/contents.tpl:31
-msgid "Source"
-msgstr "Sorgente"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Crea estensioni telefoniche"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Destinazione"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "disabilitato"
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Durata"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Nome gruppo"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Rapporti telefono"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Pubblico"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Pubblico"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6455,154 +6376,233 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
-msgid "Macro name"
-msgstr "Nome gruppo"
+msgid "Argument"
+msgstr "Argomenti"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
+
+#: 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/generic.tpl:22
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Scegli il subtree dove mettere il gruppo"
+msgid "Delete unused"
+msgstr "Rimuovi"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: 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:855
+#, 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/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
+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
 #, fuzzy
-msgid "Visible for user"
-msgstr "Lista degli utenti"
+msgid "Phone macro"
+msgstr "Rapporti telefono"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
-msgid "Macro text"
-msgstr "Nome gruppo"
+msgid "fill out"
+msgstr "Termina la sessione"
 
-#: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/phoneaccount/generic.tpl:78
 #, fuzzy
-msgid "List of macros"
-msgstr "Lista dei gruppi"
+msgid "Phone PIN"
+msgstr "Telefono"
 
-#: plugins/gofon/macro/headpage.tpl:24
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+#, fuzzy
+msgid "no macro"
+msgstr "Rapporti telefono"
+
+#: 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 ""
-"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."
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
 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/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Mosra gruppi corrispondenti a"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
+msgstr "Questa identità non possiede estensioni telefoniche"
 
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mosra gruppi corrispondenti a"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
+msgstr "Elimina estensioni telefoniche"
 
-#: plugins/gofon/macro/headpage.tpl:41
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
 #, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Espressioni regolare per selezionare il nome del gruppo"
+msgid ""
+"This account has phone features disabled. You can't enable them while no uid "
+"is set."
+msgstr "Questa identità non possiede estensioni telefoniche"
+
+#: 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/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
-msgstr ""
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr "Prego inserire un numero di telefono valido!"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-#, fuzzy
-msgid "String"
-msgstr "Ricerca"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Scegli il tuo numero di telefono personale"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, php-format
+msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-#, fuzzy
-msgid "Delete unused"
-msgstr "Rimuovi"
+#: 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/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
-msgid "The parameter %s has incorrect value for type bool."
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-#, fuzzy
-msgid "Phone macros"
-msgstr "Rapporti telefono"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid "You're about to delete the macro '%s'."
+msgid "Removed user '%s' from phone queue '%s'."
 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/phoneaccount/main.inc:120
+msgid "Phone settings"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Crea estensioni telefoniche"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Rapporti telefono"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "disabilitato"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Rapporti telefono"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: 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:378
-#, fuzzy
-msgid "Macro"
-msgstr "Nome gruppo"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Pubblico"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Pubblico"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Sorgente"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argomenti"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Destinazione"
 
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Durata"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6648,11 +6648,36 @@ 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 ""
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr ""
 
@@ -6808,187 +6833,96 @@ msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:131
 #, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:155
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:195
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:223
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:236
-#, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:307
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-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 ""
-"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 ""
-"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 ""
-"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_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
+msgid "Can't write IMAP quota. Server says '%s'."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
+#: include/class_mail-methods-cyrus.inc:155
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
+#: include/class_mail-methods-cyrus.inc:173
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/class_mail-methods-cyrus.inc:195
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:438
+#: include/class_mail-methods-cyrus.inc:223
 #, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:671
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:684
+#: include/class_mail-methods-cyrus.inc:307
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid "Can't send sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_ldap.inc:700
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
 msgstr ""
 
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
 msgstr ""
 
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: include/class_plugin.inc:398
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
+#: 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_certificate.inc:192
-#, fuzzy
-msgid "Can't create/open File"
-msgstr "File di configurazione"
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
 
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
+#: include/class_password-methods.inc:165
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
+#: 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
+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 ""
+"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!"
@@ -7418,6 +7352,72 @@ 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 ""
+
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr ""
@@ -7436,6 +7436,10 @@ msgid ""
 "Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Impossibile connettersi al server del database!"
@@ -7448,10 +7452,6 @@ msgstr "Impossibile selezionare il database!"
 msgid "Database query failed!"
 msgstr "La query al database è fallita!"
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7459,22 +7459,22 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
-#: html/main.php:96
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:139
+#: html/main.php:155
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:263
+#: html/main.php:284
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:292
+#: html/main.php:313
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
@@ -7544,6 +7544,23 @@ msgid ""
 "and let me use filters instead"
 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 "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/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Rilevato un conflitto di sessione"
@@ -7566,23 +7583,6 @@ 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!"
@@ -7605,6 +7605,23 @@ 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/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7625,6 +7642,17 @@ 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
@@ -7641,34 +7669,6 @@ 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 ""

diff --git a/locale/messages.po b/locale/messages.po
index bf1846347937f6ffb5cef93825346831b4ba5f31..9e3523d345386253381f873214163ffc454a9048 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -132,9 +132,9 @@ msgid "Export"
 msgstr ""
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr ""
 
@@ -174,143 +174,139 @@ 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."
+#: plugins/personal/mail/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
 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"
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-msgid "The required field 'Primary address' is not set."
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
 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."
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
 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."
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
 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."
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
 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."
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: 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/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
+#: plugins/admin/groups/group_objects.tpl:49
+#: 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/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
+msgid "Add"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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/generic.tpl:7 plugins/admin/groups/mail.tpl:10
@@ -352,38 +348,6 @@ msgstr ""
 msgid "List of alternative mail addresses"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
-#: plugins/personal/mail/mail_locals.tpl:41
-#: 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/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
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:49
-#: 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/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:710
-#: plugins/gofon/phoneaccount/generic.tpl:13
-msgid "Add"
-msgstr ""
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
@@ -400,13 +364,13 @@ msgstr ""
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: 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/remove.tpl:15
 #: 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/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr ""
 
@@ -491,9 +455,8 @@ msgid "disables all Mail options!"
 msgstr ""
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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
@@ -503,52 +466,11 @@ msgstr ""
 #: 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
+#: 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/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
 #: plugins/personal/connectivity/main.inc:126
@@ -571,77 +493,143 @@ msgstr ""
 msgid "User mail settings"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
+#: 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/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
+#: 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/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: 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
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
 msgstr ""
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
+#: 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/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
+#: 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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
+#: 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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
+#: 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/password/class_password.inc:5
-#: 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 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/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"
+#: 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/password/password.tpl:2
@@ -698,11 +686,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -714,6 +702,18 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr ""
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -752,35 +752,81 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
+#: 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
+msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:6
-msgid "Select groups to add"
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:40
-msgid "Select to see groups that are primary groups of users"
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:27
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Show primary groups"
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/posix_groups.tpl:28
-#: plugins/admin/groups/headpage.tpl:44
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr ""
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:6
+msgid "Select groups to add"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:40
+msgid "Select to see groups that are primary groups of users"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:44
 msgid "Select to see groups that have samba groups mappings"
 msgstr ""
 
@@ -852,63 +898,17 @@ msgstr ""
 msgid "Password expires on"
 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
-msgid "Home directory"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr ""
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
 msgstr ""
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
 msgstr ""
 
 #: plugins/personal/posix/main.inc:131
@@ -1577,13 +1577,6 @@ msgstr ""
 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 ""
@@ -1600,8 +1593,8 @@ 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/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr ""
@@ -1645,9 +1638,9 @@ msgstr ""
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1816,6 +1809,13 @@ msgstr ""
 msgid "Public visible"
 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_picture.tpl:23
 msgid "Remove picture"
 msgstr ""
@@ -1825,6 +1825,14 @@ msgstr ""
 msgid "Save"
 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/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr ""
@@ -1852,41 +1860,8 @@ msgstr ""
 msgid "Certificate serial number"
 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/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."
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr ""
-
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
 msgstr ""
 
 #: plugins/personal/connectivity/proxy.tpl:16
@@ -1909,71 +1884,63 @@ msgstr ""
 msgid "per"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
-msgid ""
-"You're trying to add an invalid email address to the list of delegations."
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
 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."
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
-msgid "The value specified as Free Busy future needs to be an integer."
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-msgid "The value specified as Free Busy Information URL is invalid."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
-#, php-format
-msgid "There's no mail user with address '%s' for your invitation policy!"
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
 msgstr ""
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr ""
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr ""
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr ""
@@ -2018,169 +1985,248 @@ msgstr ""
 msgid "Invitation policy"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "Open-Xchange Account"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
-msgid "Open-Xchange"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
 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/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
 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/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
+#: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/generic/references/class_reference.inc:32
+msgid "Proxy"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "KB"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
+msgid "GB"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "hour"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "day"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "week"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
+msgid "month"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
+#: plugins/personal/connectivity/class_proxyAccount.inc:128
+msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
+#: plugins/personal/connectivity/class_proxyAccount.inc:131
+msgid "Numerical value for Quota Setting is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
 msgstr ""
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
+#: 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/oxchange.tpl:13
-msgid "Remember"
+#: 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/oxchange.tpl:17
-msgid "Appointment Days"
+#: plugins/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
 msgstr ""
 
-#: plugins/personal/connectivity/intranet.tpl:1
-msgid "Intranet account"
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
+msgid "Manual"
 msgstr ""
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
-msgid "This account has no connectivity extensions."
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
+msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:5
-#: plugins/generic/references/class_reference.inc:32
-msgid "Proxy"
+#: 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_proxyAccount.inc:76
-msgid "KB"
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
+msgid "The value specified as Free Busy Information URL is invalid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
-msgid "GB"
+#: 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_proxyAccount.inc:77
-msgid "hour"
+#: 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_proxyAccount.inc:77
-msgid "day"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "week"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:77
-msgid "month"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:128
-msgid "Numerical value for Quota Setting is empty."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:131
-msgid "Numerical value for Quota Setting is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+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/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr ""
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
 msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
@@ -2225,17 +2271,6 @@ msgstr ""
 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 ""
@@ -2473,52 +2508,17 @@ msgid ""
 "abort."
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
+#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
+msgid "Blocklist management"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
+#: plugins/gofax/faxaccount/generic.tpl:12
+msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr ""
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr ""
-
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
-msgid "Blocklist management"
-msgstr ""
-
-#: plugins/gofax/faxaccount/generic.tpl:12
-msgid "Fax number for GOfax to trigger on"
-msgstr ""
-
-#: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
-msgid "Language"
+#: plugins/gofax/faxaccount/generic.tpl:16
+#: plugins/admin/ogroups/phonequeue.tpl:28
+msgid "Language"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:18
@@ -2612,8 +2612,8 @@ msgid "List of predefined blocklists"
 msgstr ""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
 msgid "Apply"
 msgstr ""
 
@@ -2678,55 +2678,6 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr ""
-
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr ""
-
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -2761,6 +2712,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2775,12 +2731,60 @@ msgstr ""
 msgid "Receiver"
 msgstr ""
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr ""
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr ""
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr ""
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr ""
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr ""
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr ""
@@ -2810,10 +2814,6 @@ msgstr ""
 msgid "Y-M-D"
 msgstr ""
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr ""
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -2887,6 +2887,13 @@ msgstr ""
 msgid "Dial"
 msgstr ""
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr ""
@@ -2926,13 +2933,6 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr ""
@@ -3021,6 +3021,48 @@ msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr ""
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr ""
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3084,11 +3126,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr ""
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
@@ -3101,38 +3138,6 @@ msgstr ""
 msgid "Import successful"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr ""
-
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr ""
@@ -3177,11 +3182,6 @@ msgstr ""
 msgid "Click here to save the LDAP Export "
 msgstr ""
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr ""
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr ""
@@ -3194,140 +3194,106 @@ msgstr ""
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:6
-msgid "System logs"
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:36
-msgid "No LOG servers defined!"
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:48
-#: plugins/addons/logview/class_logview.inc:138
-msgid "Can't select log database for log generation!"
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:57
-#: plugins/addons/logview/class_logview.inc:71
-#: plugins/addons/logview/class_logview.inc:210
-msgid "Query for log database failed!"
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:81
-msgid "one hour"
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
 msgstr ""
 
-#: plugins/addons/logview/class_logview.inc:81
-msgid "6 hours"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:82
-msgid "12 hours"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:82
-msgid "24 hours"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:83
-msgid "2 days"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:83
-msgid "one week"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:84
-msgid "2 weeks"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:84
-msgid "one month"
-msgstr ""
-
-#: plugins/addons/logview/class_logview.inc:135
-msgid "Can't connect to log database, no logs can be shown!"
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
+#: plugins/addons/logview/class_logview.inc:6
+msgid "System logs"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
+#: plugins/addons/logview/class_logview.inc:36
+msgid "No LOG servers defined!"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
+#: plugins/addons/logview/class_logview.inc:48
+#: plugins/addons/logview/class_logview.inc:138
+msgid "Can't select log database for log generation!"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
+#: plugins/addons/logview/class_logview.inc:57
+#: plugins/addons/logview/class_logview.inc:71
+#: plugins/addons/logview/class_logview.inc:210
+msgid "Query for log database failed!"
 msgstr ""
 
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
+#: plugins/addons/logview/class_logview.inc:81
+msgid "one hour"
 msgstr ""
 
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
+#: plugins/addons/logview/class_logview.inc:81
+msgid "6 hours"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/addons/logview/class_logview.inc:82
+msgid "12 hours"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:155
-msgid "This 'dn' is no group."
+#: plugins/addons/logview/class_logview.inc:82
+msgid "24 hours"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
+#: plugins/addons/logview/class_logview.inc:83
+msgid "2 days"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
+#: plugins/addons/logview/class_logview.inc:83
+msgid "one week"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
+#: plugins/addons/logview/class_logview.inc:84
+msgid "2 weeks"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
+#: plugins/addons/logview/class_logview.inc:84
+msgid "one month"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
+#: plugins/addons/logview/class_logview.inc:135
+msgid "Can't connect to log database, no logs can be shown!"
 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'."
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:591
+#: plugins/admin/groups/headpage.tpl:25
 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."
+"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/mail.tpl:11
@@ -3354,15 +3320,10 @@ 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
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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
@@ -3439,59 +3400,65 @@ msgstr ""
 msgid "This table displays all groups, in the selected tree."
 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."
+#: 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/application_options.tpl:1
-msgid "Application options"
+#: plugins/admin/groups/class_groupGeneric.inc:155
+msgid "This 'dn' is no group."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:153
-msgid "read"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:154
-msgid "post"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:155
-msgid "external post"
+#: plugins/admin/groups/class_groupGeneric.inc:260
+msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:156
-msgid "append"
+#: plugins/admin/groups/class_groupGeneric.inc:261
+msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:157
-msgid "write"
+#: plugins/admin/groups/class_groupGeneric.inc:266
+#, php-format
+msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:179
-msgid "This 'dn' has no valid mail extensions."
+#: 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_groupMail.inc:244
-msgid "You're trying to add an invalid email address "
+#: 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_groupMail.inc:245
-msgid "to the list of forwarders."
+#: 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/class_groupMail.inc:613
-msgid "Please enter a valid email addres in 'Primary address' field."
+#: plugins/admin/groups/application.tpl:4
+msgid "Used applications"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:646
-msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:650
-msgid "Please select a valid mail server."
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr ""
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
 msgstr ""
 
 #: plugins/admin/groups/acl.tpl:4
@@ -3502,46 +3469,53 @@ msgstr ""
 msgid "Apply this acl only for users own entries"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
+#: plugins/admin/groups/class_groupMail.inc:153
+msgid "read"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
+#: plugins/admin/groups/class_groupMail.inc:154
+msgid "post"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
+#: plugins/admin/groups/class_groupMail.inc:155
+msgid "external post"
 msgstr ""
 
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
+#: plugins/admin/groups/class_groupMail.inc:156
+msgid "append"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
+#: plugins/admin/groups/class_groupMail.inc:157
+msgid "write"
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
+#: plugins/admin/groups/class_groupMail.inc:179
+msgid "This 'dn' has no valid mail extensions."
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-msgid "Display users matching"
+#: plugins/admin/groups/class_groupMail.inc:244
+msgid "You're trying to add an invalid email address "
 msgstr ""
 
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
+#: plugins/admin/groups/class_groupMail.inc:245
+msgid "to the list of forwarders."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
+#: plugins/admin/groups/class_groupMail.inc:613
+msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
+#: plugins/admin/groups/class_groupMail.inc:646
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:650
+msgid "Please select a valid mail server."
+msgstr ""
+
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
 msgstr ""
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
@@ -3588,21 +3562,47 @@ msgstr ""
 msgid "Group members"
 msgstr ""
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:61
-msgid "This 'dn' is no appgroup."
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:69
-msgid "Remove applications"
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+msgid "Display users matching"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:70
-msgid ""
-"This group has application features enabled. You can disable them by "
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+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 ""
+
+#: plugins/admin/groups/class_groupApplication.inc:69
+msgid "Remove applications"
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:70
+msgid ""
+"This group has application features enabled. You can disable them by "
 "clicking below."
 msgstr ""
 
@@ -3629,44 +3629,77 @@ msgstr ""
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
-#: plugins/admin/users/password.tpl:2
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
 msgstr ""
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
 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/headpage.tpl:38
+msgid "Show templates"
 msgstr ""
 
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:980
-#: plugins/admin/systems/class_systemManagement.inc:699
-msgid "Template"
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
 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"
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
 msgstr ""
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr ""
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr ""
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+
+#: plugins/admin/users/password.tpl:2
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
 msgstr ""
 
 #: plugins/admin/users/class_userManagement.inc:25
@@ -3721,8 +3754,8 @@ msgstr ""
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: 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
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr ""
 
@@ -3774,70 +3807,57 @@ msgstr ""
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/users/template.tpl:6
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr ""
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
+"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/headpage.tpl:41
-msgid "Select to see users that have mail settings"
+#: 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/headpage.tpl:41
-msgid "Show mail users"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:7
@@ -3847,7 +3867,7 @@ msgid "Application name"
 msgstr ""
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -3939,29 +3959,33 @@ msgid ""
 "to do this since there is no way for GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationGeneric.inc:63
+msgid "This 'dn' is no application."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
+#: plugins/admin/applications/class_applicationGeneric.inc:159
+msgid "The specified picture has not been uploaded correctly."
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
+#: plugins/admin/applications/class_applicationGeneric.inc:240
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
+#: plugins/admin/applications/class_applicationGeneric.inc:245
+msgid "Required field 'Name' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:248
+msgid "Required field 'Execute' is not filled."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:257
+msgid "There's already an application with this 'Name'."
 msgstr ""
 
 #: plugins/admin/applications/class_applicationManagement.inc:247
@@ -3983,32 +4007,27 @@ msgstr ""
 msgid "Create new application"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
-msgid "This 'dn' is no application."
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:159
-msgid "The specified picture has not been uploaded correctly."
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:240
-msgid "You have no permissions to create a application on this 'Base'."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:245
-msgid "Required field 'Name' is not filled."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:248
-msgid "Required field 'Execute' is not filled."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:257
-msgid "There's already an application with this 'Name'."
-msgstr ""
-
-#: plugins/admin/departments/generic.tpl:8
-msgid "Name of department"
+#: plugins/admin/departments/generic.tpl:8
+msgid "Name of department"
 msgstr ""
 
 #: plugins/admin/departments/generic.tpl:9
@@ -4065,27 +4084,29 @@ msgid ""
 "<i>Delete</i> to continue or <i>Cancel</i> to abort."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
+#: 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/headpage.tpl:42
-msgid "Regular expression for matching department names"
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
 msgstr ""
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
+#: 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
@@ -4127,25 +4148,16 @@ 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."
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
 msgstr ""
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
@@ -4184,46 +4196,36 @@ msgstr ""
 msgid "offline"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
 msgstr ""
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
 msgstr ""
 
 #: plugins/admin/systems/info.tpl:1
@@ -4322,137 +4324,52 @@ 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 ""
-
-#: plugins/admin/systems/class_terminalService.inc:84
-msgid "show chooser"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:85
-msgid "direct"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:88
-msgid "load balanced"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:91
-msgid "Windows RDP"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:92
-msgid "ICA client"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:184
-msgid "Choose the phone located at the current terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-msgid "Please specify a valid VSync range."
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-msgid "Please specify a valid HSync range."
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
 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."
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:137
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
 #, php-format
-msgid "The imap connect string needs to be in the form '%s'."
+msgid "There is already an entry '%s' in the base choosen by you"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:141
-msgid "The sieve port needs to be numeric."
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
 msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:172
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6
-msgid "Server name"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr ""
-
-#: plugins/admin/systems/server.tpl:42
-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
@@ -4504,34 +4421,114 @@ msgstr ""
 msgid "Choose server to use for synchronizing time"
 msgstr ""
 
+#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+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"
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "default"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:64
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "graphic"
+#: plugins/admin/systems/class_terminalService.inc:84
+msgid "show chooser"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:89
-#: plugins/admin/systems/class_servGeneric.inc:59
-#: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:59
-msgid "No WAKECMD definition found in your gosa.conf"
+#: plugins/admin/systems/class_terminalService.inc:85
+msgid "direct"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:93
-#: plugins/admin/systems/class_terminalGeneric.inc:105
-#: plugins/admin/systems/class_terminalGeneric.inc:117
-#: plugins/admin/systems/class_servGeneric.inc:63
-#: plugins/admin/systems/class_servGeneric.inc:75
-#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_terminalService.inc:88
+msgid "load balanced"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:91
+msgid "Windows RDP"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:92
+msgid "ICA client"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:184
+msgid "Choose the phone located at the current terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
+msgid "Please specify a valid HSync range."
+msgstr ""
+
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
+msgstr ""
+
+#: plugins/admin/systems/server.tpl:42
+msgid "Select action to execute for this server"
+msgstr ""
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+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_terminalGeneric.inc:63
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "text"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:64
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "graphic"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:89
+#: plugins/admin/systems/class_servGeneric.inc:59
+#: plugins/admin/systems/class_workstationGeneric.inc:98
+#: plugins/admin/ogroups/class_termgroup.inc:59
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:93
+#: plugins/admin/systems/class_terminalGeneric.inc:105
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/systems/class_servGeneric.inc:63
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_servGeneric.inc:87
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/systems/class_workstationGeneric.inc:114
 #: plugins/admin/systems/class_workstationGeneric.inc:126
@@ -4617,18 +4614,6 @@ 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 ""
@@ -4795,12 +4780,80 @@ msgstr ""
 msgid "Workstation template for"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:126
-msgid "You have no permissions to create a printer on this 'Base'."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:33
@@ -4821,14 +4874,6 @@ msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr ""
-
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr ""
-
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr ""
@@ -4889,232 +4934,276 @@ msgstr ""
 msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid "Remove Kolab extension"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+#: 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_servKolab.inc:115
-msgid "Add Kolab service"
+#: 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_servKolab.inc:115
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: plugins/admin/systems/class_servDB.inc:172
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:149
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
+#: plugins/admin/systems/headpage.tpl:24
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Select to see MicroSoft Windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
+#: plugins/admin/systems/headpage.tpl:59
+msgid "Display systems of user"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
+#: 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/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
 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."
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "No SMTP smarthost/relayhost set."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
+#: plugins/admin/systems/class_printGeneric.inc:57
+msgid "This 'dn' has no printer features."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
+#: plugins/admin/systems/class_printGeneric.inc:126
+msgid "You have no permissions to create a printer on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Specific Phone settings"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
+#: plugins/admin/systems/phonesettings.tpl:9
+msgid "Phone type"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
+#: 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/headpage.tpl:41
-msgid "Show windows based workstations"
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:66
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
+#: plugins/admin/systems/phonesettings.tpl:35
+msgid "DTMF mode"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+msgid "Default IP"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
+#: plugins/admin/systems/phonesettings.tpl:80
+msgid "Modus"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
+#: plugins/admin/systems/phonesettings.tpl:121
+msgid "Secret"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:59
-msgid "Display systems of user"
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
+#: 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/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
 msgstr ""
 
 #: plugins/admin/systems/service.tpl:4
@@ -5280,18 +5369,6 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-
-#: plugins/admin/systems/password.tpl:6
-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."
@@ -5471,89 +5548,82 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Specific Phone settings"
+#: plugins/admin/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:9
-msgid "Phone type"
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
 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"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
 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"
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+msgid "Phone queue"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or 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/systems/phonesettings.tpl:111
-msgid "Authtype"
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
+#: plugins/admin/ogroups/headpage.tpl:51
+msgid "Display object groups matching"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
-msgid "Phone queue"
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
 msgstr ""
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
@@ -5624,15 +5694,53 @@ msgstr ""
 msgid "Regular expression for matching object names"
 msgstr ""
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+#: 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/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
+#: 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
@@ -5695,118 +5803,129 @@ msgstr ""
 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"
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"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/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
+#: plugins/admin/ogroups/phonequeue.tpl:6
+msgid "Generic queue setup"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
+#: plugins/admin/ogroups/phonequeue.tpl:11
+msgid "Phone Number"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
-#, php-format
-msgid "You're about to delete the object group '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:23
+msgid "Down"
 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!"
+#: plugins/admin/ogroups/phonequeue.tpl:39
+msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-msgid "Create new object group"
+#: 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_ogroupManagement.inc:389
-msgid "Name of object groups"
+#: plugins/admin/ogroups/phonequeue.tpl:55
+msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
+#: plugins/admin/ogroups/phonequeue.tpl:67
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
+#: plugins/admin/ogroups/phonequeue.tpl:75
+msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
+#: plugins/admin/ogroups/phonequeue.tpl:79
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
+#: plugins/admin/ogroups/phonequeue.tpl:84
+msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+#: plugins/admin/ogroups/phonequeue.tpl:98
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or 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/ogroups/phonequeue.tpl:106
+msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
+#: plugins/admin/ogroups/phonequeue.tpl:114
+msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
+#: plugins/admin/ogroups/phonequeue.tpl:122
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
+#: plugins/admin/ogroups/phonequeue.tpl:130
+msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
+#: plugins/admin/ogroups/phonequeue.tpl:138
+msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
+#: plugins/admin/ogroups/phonequeue.tpl:143
+msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
+#: plugins/admin/ogroups/phonequeue.tpl:152
+msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
+#: plugins/admin/ogroups/phonequeue.tpl:160
+msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
+#: plugins/admin/ogroups/phonequeue.tpl:168
+msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/headpage.tpl:51
-msgid "Display object groups matching"
+#: plugins/admin/ogroups/phonequeue.tpl:176
+msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/ogroups/phonequeue.tpl:184
+msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
+#: plugins/admin/ogroups/phonequeue.tpl:192
+msgid "'... calls waiting'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:200
+msgid "'Thank you' message"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:208
+msgid "'minutes' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:216
+msgid "'seconds' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Hold sound file"
 msgstr ""
 
 #: plugins/admin/ogroups/class_mailogroup.inc:38
@@ -5896,9 +6015,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:213
 #: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/gofon/macro/class_gofonMacro.inc:181
 #: 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 "
@@ -5907,9 +6026,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:223
 #: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/macro/class_gofonMacro.inc:192
 #: 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 ""
@@ -5929,480 +6048,361 @@ msgstr ""
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "Generic queue Settings"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:11
-msgid "Phone Number"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
-msgid "Down"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:39
-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
-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
-msgid "Announce holdtime"
-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 "Ring instead of playing background music"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:138
-msgid "Queue sound file setup"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:143
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:152
-msgid "Music on hold"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:160
-msgid "Welcome sound file"
+#: 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/admin/ogroups/phonequeue.tpl:168
-msgid "Announce message"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
-msgid "Sound file for 'You are next ...'"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
-msgid "'There are ...'"
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
-msgid "'... calls waiting'"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
-msgid "'Thank you' message"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
-msgid "'minutes' sound file"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
-msgid "'seconds' sound file"
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Hold sound file"
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
-msgid "no macro"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, php-format
+msgid "You're about to delete the macro '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
-msgid "undefined"
+#: 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/phoneaccount/class_phoneAccount.inc:468
-msgid "Error while performing query "
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+msgid "Create new phone macro"
 msgstr ""
 
-#: 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."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+msgid "Visible"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
-msgid "This account has no phone extensions."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
-msgid "Remove phone account"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+msgid "Macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
-msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+msgid "visible"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
-msgid "Create phone account"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+msgid "invisible"
 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."
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+msgid "This 'dn' is no phone macro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+#: plugins/gofon/macro/class_gofonMacro.inc:147
 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 "You need to specify at least one phone number!"
+"This macro ist still in use. To delete this Macro ensure that nobody has "
+"selected this Macro."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#: plugins/gofon/macro/class_gofonMacro.inc:232
 #, php-format
-msgid "You need to specify a Phone PIN."
+msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
+#: plugins/gofon/macro/class_gofonMacro.inc:250
 #, php-format
-msgid "The given PIN is not valid, only numbers are allowed for this type."
+msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
+#: plugins/gofon/macro/class_gofonMacro.inc:259
+#: plugins/gofon/macro/class_gofonMacro.inc:267
 #, php-format
-msgid "The given PIN is too short"
+msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
+#: plugins/gofon/macro/class_gofonMacro.inc:281
 #, php-format
-msgid "The number '%s' is no valid phone number!"
+msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#: plugins/gofon/macro/class_gofonMacro.inc:323
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
+msgid "The given cn '%s' already exists."
 msgstr ""
 
-#: 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"
+#: 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:1010
-msgid "Stop"
+#: 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:1045
+#: plugins/gofon/macro/class_gofonMacro.inc:337
 #, php-format
-msgid "Removed user '%s' from phone queue '%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
-msgid "Phone macro"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "fill out"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr ""
-
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
+#: plugins/gofon/macro/class_gofonMacro.inc:343
+msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
+#: plugins/gofon/macro/class_gofonMacro.inc:348
+msgid "Please choose a valid  base."
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
 msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:91
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
-msgid "This 'dn' is no phone macro."
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
 msgstr ""
 
-#: 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/gofon/macro/class_gofonMacroParameters.inc:321
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
 #, php-format
-msgid "Unable to parse macro contents on line: %s"
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:250
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
 #, php-format
-msgid "Can't perform SELECT query in DB '%s'"
+msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:259
-#: plugins/gofon/macro/class_gofonMacro.inc:267
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
 #, php-format
-msgid "Can't perform DELETE query in DB '%s'"
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:281
-#, php-format
-msgid "Can't perform INSERT query in DB '%s'"
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:323
-#, php-format
-msgid "The given cn '%s' already exists."
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:328
-msgid "You must specify the 'Display Name' in order to save this macro"
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
 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/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:337
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:343
-msgid "Makro length must be lower than 100 lines"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:348
-msgid "Please choose a valid  base."
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "fill out"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
+msgid "no macro"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+msgid "undefined"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
+msgid "Error while performing query "
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
+#: 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/headpage.tpl:6
-msgid "List of macros"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
+msgid "This account has no phone extensions."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:24
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
+msgid "Remove phone account"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
 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."
+"This account has phone features enabled. You can disable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
 msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
+#: 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/macro/headpage.tpl:41
-msgid "Regular expression for matching macro names"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
+msgid ""
+"This account has phone features disabled. You can enable them by clicking "
+"below."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
-msgid "Phone macro management"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:820
+#, php-format
+msgid "You need to specify at least one phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, php-format
+msgid "You need to specify a Phone PIN."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
+#: 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/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
-msgid "The parameter %s has incorrect value for type bool."
+msgid "The number '%s' is no valid phone number!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
+msgid "The timeout '%s' contains invalid characters!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid "You're about to delete the macro '%s'."
+msgid "Removed user '%s' from phone queue '%s'."
 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/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-msgid "Create new phone macro"
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-msgid "Visible"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: 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:378
-msgid "Macro"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-msgid "visible"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-msgid "invisible"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr ""
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:46
@@ -6443,11 +6443,35 @@ 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 ""
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr ""
 
@@ -6627,28 +6651,14 @@ msgstr ""
 msgid "Can't get sieve script. Server says '%s'."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:307
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-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?"
+#: include/class_mail-methods-cyrus.inc:307
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 
 #: include/class_plugin.inc:180
@@ -6677,19 +6687,6 @@ 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 ""
@@ -6704,80 +6701,18 @@ 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
+#: include/class_pluglist.inc:98
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
 
-#: include/class_ldap.inc:671
-#, php-format
+#: 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 ""
-"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
-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"
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
 
 #: include/functions_setup.inc:98
@@ -7167,6 +7102,71 @@ 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 ""
+
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr ""
@@ -7185,6 +7185,10 @@ msgid ""
 "Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr ""
@@ -7197,10 +7201,6 @@ msgstr ""
 msgid "Database query failed!"
 msgstr ""
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7208,22 +7208,22 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr ""
 
-#: html/main.php:96
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
 msgstr ""
 
-#: html/main.php:139
+#: html/main.php:155
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 
-#: html/main.php:263
+#: html/main.php:284
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr ""
 
-#: html/main.php:292
+#: html/main.php:313
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
@@ -7292,6 +7292,23 @@ msgid ""
 "and let me use filters instead"
 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 ""
+
+#: 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 ""
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr ""
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr ""
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr ""
@@ -7314,23 +7331,6 @@ msgstr ""
 msgid "Logout"
 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 ""
-
-#: 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 ""
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr ""
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr ""
-
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7347,6 +7347,20 @@ msgid ""
 "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/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7367,22 +7381,6 @@ msgstr ""
 msgid "Signed in:"
 msgstr ""
 
-#: 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 ""
-
-#: 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 ""
-
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr ""
@@ -7394,18 +7392,20 @@ msgid ""
 "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."
+#: 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 ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 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."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4

diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po
index 7a2ad5e6aef8d6df7dac502a3c23d76c65939d15..19d2d797e7bea80786139d2bad6e1cab1901ae8a 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -153,9 +153,9 @@ msgid "Export"
 msgstr "Exporteer"
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr "Importeren"
 
@@ -195,237 +195,187 @@ 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/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Selecteer de toe te voegen adressen"
 
-#: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:703
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr "Server"
+#: plugins/personal/mail/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+msgstr "Filters"
 
-#: plugins/personal/mail/generic.tpl:13
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Toon adressen van afdeling"
 
-#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-msgstr "Quota gebruik"
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
 
-#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:147
-msgid "not defined"
-msgstr "niet gedefiniëerd"
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Toon overeenkomende adressen"
 
-#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr "Quota grootte"
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Reguliere expresie voor overeenkomende adressen"
 
-#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
-msgid "Alternative addresses"
-msgstr "Alternatieve adressen"
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Toon adressen van gebruiker"
 
-#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:175
-#: plugins/admin/systems/phonesettings.tpl:190
-msgid "List of alternative mail addresses"
-msgstr "Lijst met alternatieve E-mail adressen"
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Gebruikersnaam van wie de adressen getoond worden"
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
 #: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
 #: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
 #: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
 #: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/groups/mail_locals.tpl:68
 #: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/servservice.tpl:47
-#: 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/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95 plugins/admin/ogroups/generic.tpl:38
 #: 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:710
 #: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
 msgstr "Toevoegen"
 
-#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
-#: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:137
-#: plugins/personal/samba/samba3.tpl:289
-#: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:64
-#: plugins/gofax/blocklists/remove.tpl:15
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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"
+
+#: 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:703
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr "Server"
+
+#: plugins/personal/mail/generic.tpl:13
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Specificeer de mailserver waarop het account opgeslagen wordt"
+
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
+msgid "Quota usage"
+msgstr "Quota gebruik"
+
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
+msgid "not defined"
+msgstr "niet gedefiniëerd"
+
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr "Quota grootte"
+
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
+msgid "Alternative addresses"
+msgstr "Alternatieve adressen"
+
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
+msgid "List of alternative mail addresses"
+msgstr "Lijst met alternatieve E-mail adressen"
+
+#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/posix/generic.tpl:74
+#: plugins/personal/posix/generic.tpl:137
+#: plugins/personal/samba/samba3.tpl:289
+#: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:64
+#: plugins/gofax/blocklists/remove.tpl:15
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
@@ -435,13 +385,13 @@ msgstr "Toevoegen"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: 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/remove.tpl:15
 #: 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/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -530,9 +480,8 @@ msgid "disables all Mail options!"
 msgstr "schakelt alle E-mail opties uit!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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
@@ -542,52 +491,11 @@ msgstr "schakelt alle E-mail opties uit!"
 #: 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
+#: plugins/gofon/phoneaccount/main.inc:104
 msgid "Finish"
 msgstr "Opslaan"
 
-#: 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 "Annuleren"
-
 #: 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
@@ -612,97 +520,177 @@ msgstr "Bewerken"
 msgid "User mail settings"
 msgstr "Gebruikers E-mail instellingen"
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Selecteer de toe te voegen adressen"
-
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
-msgstr "Filters"
-
-#: plugins/personal/mail/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Toon adressen van afdeling"
-
-#: plugins/personal/mail/mail_locals.tpl:27
-#: 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
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
-
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Toon overeenkomende adressen"
-
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-msgstr "Reguliere expresie voor overeenkomende adressen"
+#: 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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-msgstr "Toon adressen van gebruiker"
+#: 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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-msgstr "Gebruikersnaam van wie de adressen getoond worden"
+#: 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/password/class_password.inc:5
-#: 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 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/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/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Dit account heeft E-mail mogelijkheden uitgeschakeld."
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
-msgid "Change password"
-msgstr "Verander wachtwoord"
+#: 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/password/password.tpl:6
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
 msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
+"This account has mail features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Gebruik het veld hieronder om uw persoonlijke wachtwoord te veranderen. De "
-"veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u."
-"b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
+"Dit account heeft E-mail mogelijkheden ingeschakeld. U kunt deze "
+"uitschakelen door de knop hieronder te gebruiken."
 
-#: plugins/personal/password/password.tpl:10
-#: plugins/admin/users/password.tpl:6
+#: 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/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:659
+msgid "Change password"
+msgstr "Verander wachtwoord"
+
+#: plugins/personal/password/password.tpl:6
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
+msgstr ""
+"Gebruik het veld hieronder om uw persoonlijke wachtwoord te veranderen. De "
+"veranderingen worden direct doorgevoerd. Onthoud het nieuwe wachtwoord a.u."
+"b. aangezien u niet in zult kunnen loggen zonder dit wachtwoord."
+
+#: plugins/personal/password/password.tpl:10
+#: plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
@@ -746,11 +734,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -762,6 +750,18 @@ msgstr ""
 msgid "Back"
 msgstr "Terug"
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "Wachtwoord"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -805,18 +805,64 @@ 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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr "Home directory"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Toon systemen van afdeling"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: 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/generic.tpl:21
+msgid "Primary group"
+msgstr "Primaire groep"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Status"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Forceer UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Groep lidmaatschap"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Waarschuwing: NFS ondersteunt niet meer dan 16 groepen!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Account"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Omgeving"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Standaard printer"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Standaard taal"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "Systeem vertrouwen"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -907,64 +953,18 @@ msgstr "Gebruiker moet het wachtwoord bij de eerste aanmelding veranderen"
 msgid "Password expires on"
 msgstr "Het wachtwoord verloopt op"
 
-#: 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
-msgid "Home directory"
-msgstr "Home directory"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Primaire groep"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Status"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Forceer UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Groep lidmaatschap"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Waarschuwing: NFS ondersteunt niet meer dan 16 groepen!)"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Account"
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Omgeving"
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr "Standaard printer"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Selecteer de toe te voegen systemen"
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "Standaard taal"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Toon systemen van afdeling"
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "Systeem vertrouwen"
+#: 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/main.inc:131
 msgid "Unix settings"
@@ -1671,16 +1671,6 @@ msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
 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"
@@ -1697,8 +1687,8 @@ 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/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "(Achter)naam"
@@ -1742,9 +1732,9 @@ msgstr "Geslacht"
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1913,6 +1903,16 @@ msgstr "Laatste levering"
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
+#: 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:23
 msgid "Remove picture"
 msgstr "Plaatje verwijderen"
@@ -1922,6 +1922,14 @@ msgstr "Plaatje verwijderen"
 msgid "Save"
 msgstr "Opslaan"
 
+#: 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/main.inc:187
+msgid "Generic user information"
+msgstr "Algemene gebruikersinformatie"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Standaard certificaat"
@@ -1949,42 +1957,9 @@ msgstr "PKCS12 certificaat"
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: 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/main.inc:187
-msgid "Generic user information"
-msgstr "Algemene gebruikersinformatie"
-
-#: 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/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
+#: plugins/personal/connectivity/intranet.tpl:1
+msgid "Intranet account"
+msgstr "Intranet account"
 
 #: plugins/personal/connectivity/proxy.tpl:16
 msgid "Proxy account"
@@ -2008,74 +1983,63 @@ msgstr "Beperk proxy gebruik met quota"
 msgid "per"
 msgstr "per"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr "Kolab"
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "FTP account"
 
-#: 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/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr "Bandbreedte"
 
-#: 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/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Verstuur bandbreedte"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr "Altijd accepteren"
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "kb/sec"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr "Altijd afwijzen"
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Ontvangst bandbreedte"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-msgid "Reject if conflicts"
-msgstr "Afwijzen bij conflicten"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
+msgstr "Quota"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr "Handmatig bij conflicten"
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "Bestanden"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-msgid "Manual"
-msgstr "Handmatig"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Grootte"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr "Anoniem"
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr "Verhouding"
 
-#: 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/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "Verstuurde / Ontvangen bestanden"
 
-#: 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/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Selecteer om Ftp toegang uit te schakelen"
 
-#: 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/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Schakel Ftp toegang tijdelijk uit"
 
-#: 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/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "PHPGroupware account"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "PHPGroupware account"
-
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Kolab account"
@@ -2122,96 +2086,6 @@ 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"
-
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Bandbreedte"
-
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Verstuur bandbreedte"
-
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "kb/sec"
-
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Ontvangst bandbreedte"
-
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Quota"
-
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "Bestanden"
-
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
-msgstr "Grootte"
-
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Verhouding"
-
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "Verstuurde / Ontvangen bestanden"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Selecteer om Ftp toegang uit te schakelen"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Schakel Ftp toegang tijdelijk uit"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Open-Xchange Account"
@@ -2244,14 +2118,6 @@ 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"
@@ -2289,10 +2155,193 @@ msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is leeg."
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is niet geldig."
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "WebDAV Account"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+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/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/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/personal/connectivity/class_kolabAccount.inc:137
+msgid "Always accept"
+msgstr "Altijd accepteren"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:138
+msgid "Always reject"
+msgstr "Altijd afwijzen"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:139
+msgid "Reject if conflicts"
+msgstr "Afwijzen bij conflicten"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+msgstr "Handmatig bij conflicten"
+
+#: 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/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/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "Dit account heeft geen verbindings mogelijkheden."
+
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Lijst met blokkeerlijsten"
+
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Dit menu maakt het mogelijk om blokkeerlijsten toe te voegen, bewerken of "
+"verwijderen. Indien u een grote lijst heeft is het aan te raden de selectie "
+"mogelijkheden te gebruiken."
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Selecteer om de verstuur blokkeerlijsten te zien"
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr "Toon verstuur blokkeerlijsten"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr "Selecteer om de ontvangst blokkeerlijsten te zien"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr "Toon ontvangst blokkeerlijsten"
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr "Toon overeenkomende blokkeerlijsten"
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr "Reguliere expressie voor overeenkomende lijstnamen"
+
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr "Lijstnaam"
@@ -2335,17 +2384,6 @@ msgstr "Beschrijving van deze blokkeerlijst"
 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."
@@ -2602,44 +2640,6 @@ msgstr ""
 "Indien u zeker bent drukt u dan <i>Verwijderen</i> om door te gaan of "
 "<i>Annuleren</i> om te annuleren."
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Lijst met blokkeerlijsten"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"Dit menu maakt het mogelijk om blokkeerlijsten toe te voegen, bewerken of "
-"verwijderen. Indien u een grote lijst heeft is het aan te raden de selectie "
-"mogelijkheden te gebruiken."
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Selecteer om de verstuur blokkeerlijsten te zien"
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Toon verstuur blokkeerlijsten"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Selecteer om de ontvangst blokkeerlijsten te zien"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Toon ontvangst blokkeerlijsten"
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Toon overeenkomende blokkeerlijsten"
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Reguliere expressie voor overeenkomende lijstnamen"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Blokkeerlijst beheer"
@@ -2744,8 +2744,8 @@ msgid "List of predefined blocklists"
 msgstr "Lijst met voorgedefiniëerde blokkeerlijstn"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -2816,69 +2816,20 @@ msgstr ""
 "Fax afleveren op een printer is alleen mogelijk indien een geldige printer "
 "is opgegeven. Corrigeer uw keuze a.u.b."
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr "Fax voorbeeld - even geduld a.u.b."
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
+msgstr "Filter"
 
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr "Klik op de Fax om deze te downloaden"
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
+msgstr "Zoek naar"
 
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr "Fax ID"
-
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr "Gebruiker"
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr "Datum / Tijd"
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr "Afzender MSN"
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr "Afzender ID"
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr "Ontvanger MSN"
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr "Ontvanger ID"
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr "Status bericht"
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr "Overdrachtstijd"
-
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr "# pagina's"
-
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
-msgstr "Filter"
-
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
-msgstr "Zoek naar"
-
-#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
-msgid "Enter user name to search for"
-msgstr "Voer de te zoeken gebruikersnaam in"
+#: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
+msgid "Enter user name to search for"
+msgstr "Voer de te zoeken gebruikersnaam in"
 
 #: plugins/gofax/reports/contents.tpl:8 plugins/gofax/reports/contents.tpl:16
 #: plugins/gofon/reports/contents.tpl:8 plugins/gofon/reports/contents.tpl:16
@@ -2899,6 +2850,11 @@ msgstr "gedurende"
 msgid "Search"
 msgstr "Zoeken"
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr "Gebruiker"
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2913,12 +2869,60 @@ msgstr "Afzender"
 msgid "Receiver"
 msgstr "Ontvanger"
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr "# pagina's"
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "De zoekopdracht gaf geen resultaten terug..."
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr "Fax voorbeeld - even geduld a.u.b."
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr "Klik op de Fax om deze te downloaden"
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr "Fax ID"
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr "Datum / Tijd"
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr "Afzender MSN"
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr "Afzender ID"
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr "Ontvanger MSN"
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr "Ontvanger ID"
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr "Status bericht"
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr "Overdrachtstijd"
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Fax rapporten"
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Fax rapporten"
@@ -2949,10 +2953,6 @@ msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
 msgid "Y-M-D"
 msgstr "J-M-D"
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Fax rapporten"
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -3030,6 +3030,16 @@ msgstr "Bel..."
 msgid "Dial"
 msgstr "Kies"
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Dit omvat alle adresboek data in dit record. Verzeker uzelf ervan dat dit "
+"hetgeen is dat u wenst, aangezien er geen manier voor GOsa is om deze data "
+"terug te halen."
+
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr "Selecteer de afdeling waarin de invoer bewaard wordt."
@@ -3069,16 +3079,6 @@ msgstr "Plaats"
 msgid "Country"
 msgstr "Land"
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"Dit omvat alle adresboek data in dit record. Verzeker uzelf ervan dat dit "
-"hetgeen is dat u wenst, aangezien er geen manier voor GOsa is om deze data "
-"terug te halen."
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Adresboek"
@@ -3173,6 +3173,52 @@ msgstr ""
 "U heeft geen toestemming om globale adresboek invoeren te wijzigen of aan te "
 "maken."
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+"De CSV import module bevat mothodes om gebruikers accounts aan te maken "
+"vanuit een bestand met komma gescheiden waardes. De beheerder kan bepalen "
+"welke kolommen vertaald moeten worden naar welke atributen. Merk op dat u "
+"tenminste het UID, GIVENNAME en SURNAME atribuut dient in te stellen."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr "Selecteer het te importeren CSV bestand"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr "Doorzoek"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr "Selecteer sjabloon"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr "Alle gegevens zijn succesvol naar de LDAP database weggeschreven."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr "Oeps. Er is een fout opgetreden bij het importeren van uw data."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr "Hier is het status raport voor de import"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr "Geselecteerd Sjabloon"
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr "LDAP beheer"
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3242,11 +3288,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr "Importeer LDIF bestand"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr "Doorzoek"
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr "Verander bestaand atribuut"
@@ -3259,42 +3300,6 @@ msgstr "Overschrijf bestaande gegevens"
 msgid "Import successful"
 msgstr "Import was succesvol"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-"De CSV import module bevat mothodes om gebruikers accounts aan te maken "
-"vanuit een bestand met komma gescheiden waardes. De beheerder kan bepalen "
-"welke kolommen vertaald moeten worden naar welke atributen. Merk op dat u "
-"tenminste het UID, GIVENNAME en SURNAME atribuut dient in te stellen."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr "Selecteer het te importeren CSV bestand"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr "Selecteer sjabloon"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Alle gegevens zijn succesvol naar de LDAP database weggeschreven."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr "Oeps. Er is een fout opgetreden bij het importeren van uw data."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr "Hier is het status raport voor de import"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr "Geselecteerd Sjabloon"
-
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr "U heeft geen toestemming om LDAP gegevens te importeren."
@@ -3343,11 +3348,6 @@ msgstr "Klik hier om de complete LDAP database op te slaan in een bestand."
 msgid "Click here to save the LDAP Export "
 msgstr "Klik hier om de LDAP export op te slaan in een bestand."
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-msgid "LDAP manager"
-msgstr "LDAP beheer"
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr "CSV import"
@@ -3360,6 +3360,42 @@ msgstr "U heeft geen toestemming om LDAP gegevens te exporteren."
 msgid "Error while exporting the requested entries!"
 msgstr "Fout bij het exporteren van de gevraagde gegevens!"
 
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr "Toon computers"
+
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr "Log prioriteit"
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr "Tijd interval"
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr "Voer de te zoeken string in"
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr "Ruleset"
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr "Prioriteit"
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr "Computernaam"
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr "Bericht"
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr "Systeem log weergave"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Systeem logs"
@@ -3416,90 +3452,19 @@ msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 "Kan niet met de log database verbinden. Logs kunnen niet getoond worden!"
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Toon computers"
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Log prioriteit"
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Tijd interval"
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Voer de te zoeken string in"
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Ruleset"
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Prioriteit"
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Computernaam"
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Bericht"
-
-#: plugins/addons/logview/main.inc:23
-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/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lijst met groepen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:591
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"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 ""
-"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."
+"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/mail.tpl:11
 msgid "Primary mail address for this shared folder"
@@ -3525,19 +3490,13 @@ 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
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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 ""
-"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."
+"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"
@@ -3618,17 +3577,78 @@ msgstr "Eigenschappen"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: 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 ""
-"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."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 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."
+"Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
+"liggende streepjes zijn toegestaan."
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Programma opties"
+#: 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/application.tpl:4
+msgid "Used applications"
+msgstr "Gebruikte programma's"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Parameters bewerken"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Bewerk optionele programma parameters"
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr "Beschikbare programma's"
+
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Object"
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Pas toegangsbeheer alleen toe op gegevens van de gebruiker zelf"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3677,55 +3697,9 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Selecteer a.u.b. een geldig mailserver"
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Object"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Pas toegangsbeheer alleen toe op gegevens van de gebruiker zelf"
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Gebruikte programma's"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Parameters bewerken"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Bewerk optionele programma parameters"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Beschikbare programma's"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Selecteer de toe te voegen gebruikers"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr "Toon gebruikers van afdeling"
-
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-msgid "Display users matching"
-msgstr "Toon overeenkomende gebruikers"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr "Deze 'dn' bevat geen toegangsbeheer."
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr "Alle velden zijn aanpasbaar"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Map beheerders"
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -3773,23 +3747,49 @@ msgstr "Leden zitten in een telefoon beantwoordgroep"
 msgid "Group members"
 msgstr "Groepsleden"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Map beheerders"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Selecteer de toe te voegen gebruikers"
 
-#: plugins/admin/groups/class_groupApplication.inc:61
-msgid "This 'dn' is no appgroup."
-msgstr "Deze 'dn' bevat geen programma informatie"
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr "Toon gebruikers van afdeling"
 
-#: plugins/admin/groups/class_groupApplication.inc:69
-msgid "Remove applications"
-msgstr "Programma's verwijderen"
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+msgid "Display users matching"
+msgstr "Toon overeenkomende gebruikers"
 
-#: plugins/admin/groups/class_groupApplication.inc:70
-msgid ""
-"This group has application features enabled. You can disable them by "
-"clicking below."
-msgstr ""
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr "Deze 'dn' bevat geen toegangsbeheer."
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+msgstr "Alle velden zijn aanpasbaar"
+
+#: 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"
+
+#: plugins/admin/groups/class_groupApplication.inc:69
+msgid "Remove applications"
+msgstr "Programma's verwijderen"
+
+#: plugins/admin/groups/class_groupApplication.inc:70
+msgid ""
+"This group has application features enabled. You can disable them by "
+"clicking below."
+msgstr ""
 "Deze groep heeft programma mogelijkheden ingeschakeld. U kunt deze "
 "uitschakelen door de knop hieronder te gebruiken."
 
@@ -3819,6 +3819,78 @@ msgstr "Het geselecteerde programma heeft geen opties."
 msgid "The application named %s is no longer available and has been removed."
 msgstr "Het programma, genaamd %s, is niet meer beschikbaar en is verwijderd."
 
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Lijst met gebruikers"
+
+#: plugins/admin/users/headpage.tpl:24
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde gebruikers toe te voegen, "
+"bewerken of verwijderen. Indien u veel gebruikers heeft, dan is het aan te "
+"raden de selectie mogelijkheden te gebruiken."
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Selecteer om sjabloon pseudo gebruikers te zien"
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr "Toon sjablonen"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr "Selecteer om gebruikers te zien die alleen een GOsa LDAP object hebben"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Toon functionele gebruikers"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr "Selecteer om gebruikers te zien die POSIX instellingen hebben"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr "Toon Unix gebruikers"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr "Selecteer om gebruikers te zien die E-mail instellingen hebben"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Toon E-mail gebruikers"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr "Selecteer om gebruikers te zien die Samba instellingen hebben"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Toon Samba gebruikers"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Toon Proxy gebruikers"
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"Dit omvat alle account gegevens, systeem toegangsregels, imap instellingen "
+"etc. voor deze gebruiker. Verzeker uzelf hiervan, aangezien er geen "
+"mogelijkheid voor GOsa is om deze informatie terug te halen."
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -3829,42 +3901,6 @@ 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/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Een nieuwe gebruiker aanmaken m.b.v. een 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/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:980
-#: plugins/admin/systems/class_systemManagement.inc:699
-msgid "Template"
-msgstr "Sjabloon"
-
-#: 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"
@@ -3922,8 +3958,8 @@ msgstr "Wachtwoord"
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: 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
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -3985,77 +4021,64 @@ msgstr "online"
 msgid "Offline"
 msgstr "offline"
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Dit omvat alle account gegevens, systeem toegangsregels, imap instellingen "
-"etc. voor deze gebruiker. Verzeker uzelf hiervan, aangezien er geen "
-"mogelijkheid voor GOsa is om deze informatie terug te halen."
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Sjabloon"
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "Lijst met 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/headpage.tpl:24
+#: plugins/admin/users/template.tpl:6
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+"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 ""
-"Dit menu maakt het mogelijk om geselecteerde gebruikers toe te voegen, "
-"bewerken of verwijderen. Indien u veel gebruikers heeft, dan is het aan te "
-"raden de selectie mogelijkheden te gebruiken."
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Selecteer om sjabloon pseudo gebruikers te zien"
-
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-msgstr "Toon sjablonen"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr "Selecteer om gebruikers te zien die alleen een GOsa LDAP object hebben"
-
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Toon functionele gebruikers"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Selecteer om gebruikers te zien die POSIX instellingen hebben"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Toon Unix gebruikers"
+"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/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Selecteer om gebruikers te zien die E-mail instellingen hebben"
+#: 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/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Toon E-mail gebruikers"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Gebruikersbeheer"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Selecteer om gebruikers te zien die Samba instellingen hebben"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Lijst met programma's"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Toon Samba gebruikers"
+#: plugins/admin/applications/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+"Dit menu maakt het mogelijk om geselecteerde programma's toe te voegen, "
+"bewerken of verwijderen. Indien u veel programma's heeft is het aan te raden "
+"de selectie mogelijkheden te gebruiken."
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
+msgstr "Toon overeenkomende programma's"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Toon Proxy gebruikers"
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
+msgstr "Reguliere expressie voor overeenkomende programma namen"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -4064,7 +4087,7 @@ msgid "Application name"
 msgstr "Programmanaam"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -4163,33 +4186,35 @@ msgstr ""
 "is wat u wil, aangezien er geen mogelijkheid voor GOsa is om uw date terug "
 "te halen."
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lijst met programma's"
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
+msgstr "Programma beheer"
 
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
+#: plugins/admin/applications/class_applicationGeneric.inc:63
+msgid "This 'dn' is no application."
+msgstr "Deze 'dn' is geen programma."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:159
+msgid "The specified picture has not been uploaded correctly."
+msgstr "Het opgegeven plaatje is niet correct ge-upload"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:240
+msgid "You have no permissions to create a application on this 'Base'."
 msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde programma's toe te voegen, "
-"bewerken of verwijderen. Indien u veel programma's heeft is het aan te raden "
-"de selectie mogelijkheden te gebruiken."
+"U heeft geen toestemming een programma aan te maken onder deze 'Basis'."
 
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
-msgstr "Toon overeenkomende programma's"
+#: plugins/admin/applications/class_applicationGeneric.inc:245
+msgid "Required field 'Name' is not filled."
+msgstr "Vereiste veld 'Naam' is leeg."
 
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
-msgstr "Reguliere expressie voor overeenkomende programma namen"
+#: plugins/admin/applications/class_applicationGeneric.inc:248
+msgid "Required field 'Execute' is not filled."
+msgstr "Vereist veld 'Uitvoeren' is leeg."
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
-msgid "Application management"
-msgstr "Programma beheer"
+#: plugins/admin/applications/class_applicationGeneric.inc:257
+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
@@ -4212,30 +4237,27 @@ msgstr "Nieuw"
 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."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:159
-msgid "The specified picture has not been uploaded correctly."
-msgstr "Het opgegeven plaatje is niet correct ge-upload"
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr "Lijst met afdelingen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:240
-msgid "You have no permissions to create a application on this 'Base'."
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
 msgstr ""
-"U heeft geen toestemming een programma aan te maken onder deze 'Basis'."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:245
-msgid "Required field 'Name' is not filled."
-msgstr "Vereiste veld 'Naam' is leeg."
+"Dit menu maakt het mogelijk om geselecteerde afdelingen toe te voegen, "
+"bewerken of verwijderen. Indien u veel afdelingen heeft is het aan te raden "
+"de selectie mogelijkheden te gebruiken."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:248
-msgid "Required field 'Execute' is not filled."
-msgstr "Vereist veld 'Uitvoeren' is leeg."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr "Toon overeenkomende afdelingen"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:257
-msgid "There's already an application with this 'Name'."
-msgstr "Er is al een programma met deze 'Naam'."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
+msgstr "Reguliere expressie voor overeenkomende afdelingen"
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -4301,31 +4323,31 @@ msgstr ""
 "alvorens u doorgaat. Indien u dat gedaan heeft drukt u op <i>Verwijderen</i> "
 "om door te gaan of op <i>Annuleren</i> om te annuleren."
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Lijst met afdelingen"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
+msgstr "Afdeling beheer"
 
-#: plugins/admin/departments/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
 msgstr ""
-"Dit menu maakt het mogelijk om geselecteerde afdelingen toe te voegen, "
-"bewerken of verwijderen. Indien u veel afdelingen heeft is het aan te raden "
-"de selectie mogelijkheden te gebruiken."
+"U heeft geen toestemming om een afdeling aan te maken onder deze 'Basis'."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Toon overeenkomende afdelingen"
+#: 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/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "Reguliere expressie voor overeenkomende afdelingen"
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr "Vereist veld 'Omschrijving' is leeg."
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
-msgstr "Afdeling beheer"
+#: 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
@@ -4370,27 +4392,17 @@ 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/systems/network.tpl:1
+msgid "Network settings"
+msgstr "Netwerk instellingen"
 
-#: 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/systems/network.tpl:8
+msgid "IP-address"
+msgstr "IP adres"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr "Kies a.u.b. een andere naam."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr "Hardware adres (MAC)"
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
@@ -4430,48 +4442,37 @@ msgstr "onbekende status"
 msgid "offline"
 msgstr "offline"
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Netwerk instellingen"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "NFS Export"
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
-msgstr "IP adres"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Tijd Service"
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr "Hardware adres (MAC)"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "LDAP Service"
 
-#: 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:72
+msgid "Terminal Service"
+msgstr "Terminal Service"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr "Deze 'dn' heeft geen netwerk mogelijkheden."
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Schakel inlog mogelijkheid tijdelijk uit"
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-msgid "The required field 'Component name' is not set."
-msgstr "Het vereiste veld 'Component naam' is leeg."
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Font path"
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Syslog Service"
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Print Service"
 
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
@@ -4569,137 +4570,53 @@ msgstr "Audio service"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Systeembeheer"
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr "Deze 'dn' heeft geen netwerk mogelijkheden."
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "NFS Export"
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+msgid "The required field 'Component name' is not set."
+msgstr "Het vereiste veld 'Component naam' is leeg."
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Tijd Service"
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "LDAP Service"
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Terminal Service"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Systeembeheer"
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Schakel inlog mogelijkheid tijdelijk uit"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Terminal sjabloon"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Font path"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Terminal naam"
 
-#: 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"
-
-#: plugins/admin/systems/class_terminalService.inc:88
-msgid "load balanced"
-msgstr "load balanced"
-
-#: plugins/admin/systems/class_terminalService.inc:91
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:92
-msgid "ICA client"
-msgstr "ICA client"
-
-#: plugins/admin/systems/class_terminalService.inc:184
-msgid "Choose the phone located at the current terminal"
-msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
-
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-msgid "Please specify a valid VSync range."
-msgstr "Geef a.u.b. een geldig VSync bereik op."
-
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-msgid "Please specify a valid HSync range."
-msgstr "Geef a.u.b. een geldig HSync bereik op."
-
-#: 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/server.tpl:6
-msgid "Server name"
-msgstr "Server naam"
-
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Selecteer de subtree waar de terminal onder geplaatst zal worden"
 
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Actie"
-
-#: plugins/admin/systems/server.tpl:42
-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
@@ -4751,11 +4668,91 @@ msgstr "NTP tijdserver"
 msgid "Choose server to use for synchronizing time"
 msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
 
+#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Actie"
+
 #: 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_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"
+
+#: plugins/admin/systems/class_terminalService.inc:88
+msgid "load balanced"
+msgstr "load balanced"
+
+#: plugins/admin/systems/class_terminalService.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_terminalService.inc:92
+msgid "ICA client"
+msgstr "ICA client"
+
+#: plugins/admin/systems/class_terminalService.inc:184
+msgid "Choose the phone located at the current terminal"
+msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
+
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
+msgid "Please specify a valid VSync range."
+msgstr "Geef a.u.b. een geldig VSync bereik op."
+
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
+msgid "Please specify a valid HSync range."
+msgstr "Geef a.u.b. een geldig HSync bereik op."
+
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
+msgstr "Server naam"
+
+#: plugins/admin/systems/server.tpl:42
+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/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr "Terminal server moet een fontpath hebben."
+
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Werkstation sjabloon"
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Werkstation naam"
+
+#: 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_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4871,18 +4868,6 @@ 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."
@@ -5078,58 +5063,118 @@ msgstr "Terminal sjabloon"
 msgid "Workstation template for"
 msgstr "Werkstation sjabloon voor"
 
-#: plugins/admin/systems/class_printGeneric.inc:57
-msgid "This 'dn' has no printer features."
-msgstr "Deze 'dn' heeft geen printer mogelijkheden."
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "POP3 service"
 
-#: 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:22
+msgid "POP3/SSL service"
+msgstr "POP3/SSL service"
 
-#: plugins/admin/systems/class_servDNS.inc:33
-msgid "Remove DNS service"
-msgstr "Verwijder DNS service"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "IMAP Service"
 
-#: plugins/admin/systems/class_servDNS.inc:34
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"Deze server heeft DNS mogelijkheden ingeschakeld. U kunt deze uitschakelen "
-"door de knop hieronder te gebruiken."
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "IMAP/SSL service"
 
-#: plugins/admin/systems/class_servDNS.inc:36
-msgid "Add DNS service"
-msgstr "Voeg DNS service toe"
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Sieve service"
 
-#: plugins/admin/systems/class_servDNS.inc:37
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
-"Deze server heeft DNS mogelijkheden uitgeschakeld. U kunt deze inschakelen "
-"door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Werkstation sjabloon"
+"FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Werkstation naam"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "HTTP Free/Busy service (vervallen)"
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Kerberos kadmin toegang"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Amavis email scannen (virus/anti-spam)"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Kerberos Realm"
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Quota instellingen"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Beheerder"
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Free/Busy instellingen"
 
-#: plugins/admin/systems/servdb.tpl:26
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "SMTP toegestane netwerken"
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Hosts/netwerken die E-mail mogen ralayen"
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhost"
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Sta MX record opzoeken voor relayhost toe"
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Host die gebruikt wordt om E-mails te relayen"
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Accepteer Internet E-mail"
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
+
+#: plugins/admin/systems/class_servDNS.inc:33
+msgid "Remove DNS service"
+msgstr "Verwijder DNS service"
+
+#: plugins/admin/systems/class_servDNS.inc:34
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"Deze server heeft DNS mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_servDNS.inc:36
+msgid "Add DNS service"
+msgstr "Voeg DNS service toe"
+
+#: plugins/admin/systems/class_servDNS.inc:37
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
+msgstr ""
+"Deze server heeft DNS mogelijkheden uitgeschakeld. U kunt deze inschakelen "
+"door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Kerberos kadmin toegang"
+
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Kerberos Realm"
+
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Beheerder"
+
+#: plugins/admin/systems/servdb.tpl:26
 msgid "FAX database"
 msgstr "FAX database"
 
@@ -5177,163 +5222,32 @@ msgstr "Log database"
 msgid "Logging DB user"
 msgstr "Log DB gebruiker"
 
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid "Remove Kolab extension"
-msgstr "Verwijder Kolab mogelijkheden"
-
-#: plugins/admin/systems/class_servKolab.inc:112
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft Kolab mogelijkheden ingeschakeld. U kunt deze uitschakelen "
-"door de knop hieronder te gebruiken."
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Add Kolab service"
-msgstr "Voeg Kolab service toe"
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Deze server heeft Kolab mogelijkheden uitgeschakeld. U kunt deze inschakelen "
-"door de knop hieronder te gebruiken."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Machine naam"
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: 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 "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-"Gebruik data van %s dagen geleden wanneer free/busy lijsten worden aangemaakt"
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "Het atribuut '%s' is leeg of bevat ongeldige karakters!"
 
-#: plugins/admin/systems/class_servKolab.inc:149
+#: plugins/admin/systems/class_servDB.inc:137
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
-"Waarschuw gebruikers wanneer meer dan %s%% van hun E-mail quota gebruikt "
-"wordt"
-
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Toekomstige dagen moet ingesteld zijn in de Free/Busy instellingen."
-
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-"Toekomstige dagen moet een positieve waarde bevatten in de Free/Busy "
-"instellingen."
-
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
-msgstr "De opgegeven Quota instellingen moeten nummeriek zijn."
-
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr "Kies a.u.b. een waarde tussen 1 en 100 voor de Quota instellingen."
-
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
-msgstr "Toekomstige dagen moet een waarde bevatten."
-
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
-msgstr "Er zijn geen netwerken met SMTP privileges ingesteld"
-
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
-msgstr "Er is geen SMTP smarthost/relayhost ingesteld"
-
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "POP3 service"
-
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "POP3/SSL service"
-
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "IMAP Service"
-
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "IMAP/SSL service"
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Sieve service"
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
-msgstr ""
-"FTP Free/Busy service (vervallen, niet compatibel met Kolab2 Free/Busy)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "HTTP Free/Busy service (vervallen)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Amavis email scannen (virus/anti-spam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Quota instellingen"
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Free/Busy instellingen"
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
-
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "SMTP toegestane netwerken"
-
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Hosts/netwerken die E-mail mogen ralayen"
-
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr ""
-
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhost"
-
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Sta MX record opzoeken voor relayhost toe"
-
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Host die gebruikt wordt om E-mails te relayen"
-
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Accepteer Internet E-mail"
-
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
+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/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Machine naam"
+#: 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/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 ""
-"Dit omvat <b>alle</b> systeem en configuratie informatie. Verzeker uzelf "
-"hiervan, aangezien er geen manier is voor GOsa om deze gegevens terug te "
-"halen."
+#: 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/headpage.tpl:6
 msgid "List of systems"
@@ -5422,12 +5336,192 @@ msgstr "Toon adressen van gebruiker"
 msgid "User name of which terminal(s) are shown"
 msgstr "Gebruikersnaam van wie de terminal(s) getoond worden"
 
-#: plugins/admin/systems/service.tpl:4
-msgid "Keyboard"
-msgstr "Toetsenbord"
+#: 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 ""
+"Dit omvat <b>alle</b> systeem en configuratie informatie. Verzeker uzelf "
+"hiervan, aangezien er geen manier is voor GOsa om deze gegevens terug te "
+"halen."
 
-#: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
-msgid "Model"
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid "Remove Kolab extension"
+msgstr "Verwijder Kolab mogelijkheden"
+
+#: plugins/admin/systems/class_servKolab.inc:112
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft Kolab mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Add Kolab service"
+msgstr "Voeg Kolab service toe"
+
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Deze server heeft Kolab mogelijkheden uitgeschakeld. U kunt deze inschakelen "
+"door de knop hieronder te gebruiken."
+
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+"Gebruik data van %s dagen geleden wanneer free/busy lijsten worden aangemaakt"
+
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Waarschuw gebruikers wanneer meer dan %s%% van hun E-mail quota gebruikt "
+"wordt"
+
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Toekomstige dagen moet ingesteld zijn in de Free/Busy instellingen."
+
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+"Toekomstige dagen moet een positieve waarde bevatten in de Free/Busy "
+"instellingen."
+
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
+msgstr "De opgegeven Quota instellingen moeten nummeriek zijn."
+
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr "Kies a.u.b. een waarde tussen 1 en 100 voor de Quota instellingen."
+
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
+msgstr "Toekomstige dagen moet een waarde bevatten."
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr "Er zijn geen netwerken met SMTP privileges ingesteld"
+
+#: plugins/admin/systems/class_servKolab.inc:239
+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/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/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+"Om het terminal root wachtwoord te veranderen moet u de velden hieronder "
+"gebruiken. De veranderingen zullen vanaf de volgende herstart effectief "
+"zijn. Onthoud het nieuwe wachtwoord a.u.b. anders kunt u niet inloggen. "
+"<b>Laat de velden leeg om het standaard wachtwoord te gebruiken.</b>"
+
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
+msgstr ""
+"Het veranderen van het wachtwoord is alleen van toepassing op authenticatie."
+
+#: plugins/admin/systems/service.tpl:4
+msgid "Keyboard"
+msgstr "Toetsenbord"
+
+#: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
+msgid "Model"
 msgstr "Model"
 
 #: plugins/admin/systems/service.tpl:9
@@ -5586,23 +5680,6 @@ msgstr "Lever scan diensten"
 msgid "Select scanner driver to use"
 msgstr "Selecteer de te gebruiken scanner driver"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-"Om het terminal root wachtwoord te veranderen moet u de velden hieronder "
-"gebruiken. De veranderingen zullen vanaf de volgende herstart effectief "
-"zijn. Onthoud het nieuwe wachtwoord a.u.b. anders kunt u niet inloggen. "
-"<b>Laat de velden leeg om het standaard wachtwoord te gebruiken.</b>"
-
-#: plugins/admin/systems/password.tpl:6
-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."
@@ -5795,91 +5872,91 @@ 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/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/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+msgstr ""
+"Alle acties die u hier kiest, beinvloeden <b>alle</b> machines in deze "
+"objectgroep. Let op dat het herstarten van machines waarop mensen werken tot "
+"irritatie kan leiden"
 
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
-msgstr "ververs"
+#: plugins/admin/ogroups/termgroup.tpl:7
+msgid "Select action to execute for this   group of terminals"
+msgstr "Selecteer de voor deze terminal-groep uit te voeren actie"
 
-#: plugins/admin/systems/phonesettings.tpl:35
-msgid "DTMF mode"
-msgstr "DTMF modus"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr "Mail distributielijst"
 
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:90
-msgid "Default IP"
-msgstr "Standaard IP"
+#: 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:59
-#: plugins/admin/systems/phonesettings.tpl:98
-msgid "Response timeout"
-msgstr "Beantwoord timeout"
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Terminals"
 
-#: plugins/admin/systems/phonesettings.tpl:80
-msgid "Modus"
-msgstr "Modus"
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#, fuzzy
+msgid "Phone queue"
+msgstr "Telefoonnummer"
 
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr "Authorisatietype"
-
-#: plugins/admin/systems/phonesettings.tpl:121
-msgid "Secret"
-msgstr "Wachtwoord"
+#: plugins/admin/ogroups/headpage.tpl:24
+msgid ""
+"This menu allows you to add, edit or 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 is het aan te raden de selectie "
+"mogelijkheden te gebruiken."
 
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
-msgstr "GOFonInKeys"
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Toon groepen die gebruikers bevatten"
 
-#: plugins/admin/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr "GoFonOutKeys"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Toon groepen die groepen bevatten"
 
-#: plugins/admin/systems/phonesettings.tpl:150
-msgid "Account code"
-msgstr "Account code"
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Toon groepen die programma's bevatten"
 
-#: plugins/admin/systems/phonesettings.tpl:158
-msgid "Trunk lines"
-msgstr "Trunk lijnen"
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Toon groepen die afdelingen bevatten"
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr "Hosts die mogen verbinden"
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Toon groepen die servers bevatten"
 
-#: plugins/admin/systems/phonesettings.tpl:188
-msgid "Hosts that are not allowed to connect"
-msgstr "Hosts die niet mogen verbinden"
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Toon groepen die werkstations bevatten"
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr "MSN"
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Toon groepen die terminals bevatten"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminals"
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Toon groepen die printers bevatten"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
-msgid "Phone queue"
-msgstr "Telefoonnummer"
+msgid "Display object groups matching"
+msgstr "Toon overeenkomende objecten"
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Naam van de groep"
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Lidmaatschap objecten"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -5949,82 +6026,8 @@ msgstr "Toon overeenkomende objecten"
 msgid "Regular expression for matching object names"
 msgstr "Reguliere expressie voor overeenkomende objectnamen"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-"Alle acties die u hier kiest, beinvloeden <b>alle</b> machines in deze "
-"objectgroep. Let op dat het herstarten van machines waarop mensen werken tot "
-"irritatie kan leiden"
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-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_ogroup.inc:95
-msgid "This 'dn' is no object group."
-msgstr "Deze 'dn' is geen objectgroep."
-
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "too many different objects!"
-msgstr "te veel verschillende object tpyes!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "users"
-msgstr "gebruikers"
-
-#: plugins/admin/ogroups/class_ogroup.inc:206
-msgid "groups"
-msgstr "groepen"
-
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "applications"
-msgstr "programma's"
-
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "departments"
-msgstr "afdelingen"
-
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "servers"
-msgstr "servers"
-
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "workstations"
-msgstr "werkstations"
-
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "terminals"
-msgstr "terminals"
-
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "phones"
-msgstr "telefoons"
-
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "printers"
-msgstr "printers"
-
-#: plugins/admin/ogroups/class_ogroup.inc:220
-msgid "and"
-msgstr "en"
-
-#: plugins/admin/ogroups/class_ogroup.inc:371
-msgid "Non existing dn: "
-msgstr "Niet bestaande dn: "
-
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr "Objectgroepen hebben ten minste een groepslid nodig!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:507
-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
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
 msgstr "Objectgroepen"
 
@@ -6074,210 +6077,73 @@ msgstr "Objectgroep"
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Naam van de groep"
-
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Lidmaatschap objecten"
-
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
-"mogelijkheid voor GOsa is om uw data terug te krijgen."
-
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or 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 is het aan te raden de selectie "
-"mogelijkheden te gebruiken."
-
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Toon groepen die gebruikers bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Toon groepen die groepen bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Toon groepen die programma's bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Toon groepen die afdelingen bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Toon groepen die servers bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Toon groepen die werkstations bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Toon groepen die terminals bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Toon groepen die printers bevatten"
-
-#: plugins/admin/ogroups/headpage.tpl:51
-#, fuzzy
-msgid "Display object groups matching"
-msgstr "Toon overeenkomende objecten"
-
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr "Mail distributielijst"
-
-#: 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/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/class_phonequeue.inc:83
-#, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "Verwijder telefoon account"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-#, fuzzy
-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/class_phonequeue.inc:86
-#, fuzzy
-msgid "Create phone queue"
-msgstr "Telefoon account aanmaken"
-
-#: 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 ""
-"Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
-
-#: 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 "ja"
+#: plugins/admin/ogroups/class_ogroup.inc:95
+msgid "This 'dn' is no object group."
+msgstr "Deze 'dn' is geen objectgroep."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "too many different objects!"
+msgstr "te veel verschillende object tpyes!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr "gebruikers"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:206
+msgid "groups"
+msgstr "groepen"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "applications"
+msgstr "programma's"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "departments"
+msgstr "afdelingen"
 
-#: 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_ogroup.inc:209
+msgid "servers"
+msgstr "servers"
 
-#: 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_ogroup.inc:210
+msgid "workstations"
+msgstr "werkstations"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "terminals"
+msgstr "terminals"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
-msgid "Max queue length must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:212
+msgid "phones"
+msgstr "telefoons"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "printers"
+msgstr "printers"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
-msgid "There must be least one queue number defined."
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:220
+msgid "and"
+msgstr "en"
 
-#: 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_ogroup.inc:371
+msgid "Non existing dn: "
+msgstr "Niet bestaande dn: "
 
-#: 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_ogroup.inc:502
+msgid "Object groups need at least one member!"
+msgstr "Objectgroepen hebben ten minste een groepslid nodig!"
 
-#: 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_ogroup.inc:507
+msgid "You can combine two different object types at maximum only!"
+msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
 
-#: 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'."
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
+"Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
+"mogelijkheid voor GOsa is om uw data terug te krijgen."
 
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
@@ -6407,195 +6273,229 @@ msgstr ""
 msgid "Hold sound file"
 msgstr ""
 
-#: 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 "Error while performing query "
-msgstr "Fout bij het exporteren van de gevraagde gegevens!"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
-"De macro die u in het verleden geselecteerd heeft, is niet meer beschikbaar. "
-"Selecteer a.u.b. een andere macro."
+"Deze groep heeft E-mail mogelijkheden ingeschakeld. U kunt deze uitschakelen "
+"door de knop hieronder te gebruiken."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:610
-msgid "This account has no phone extensions."
-msgstr "Dit account heeft geen telefoon mogelijkheden."
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:620
-msgid "Remove phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "Remove the phone queue from this Account"
 msgstr "Verwijder telefoon account"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+#, fuzzy
 msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+"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/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
-msgid "Create phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid "Create phone queue"
 msgstr "Telefoon account aanmaken"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
 msgid ""
-"This account has phone features disabled. You can't enable them while no uid "
-"is set."
+"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/gofon/phoneaccount/class_phoneAccount.inc:628
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
-"Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
-"inschakelen door de knop hieronder te gebruiken."
 
-#: 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 "No"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
-msgid "Choose your private phone"
-msgstr "Kies uw privé telefoon"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+#, fuzzy
+msgid "Yes"
+msgstr "ja"
 
-#: 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:136
+msgid "ring all available channels until one answers"
+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:137
+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."
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+msgid "ring interface which was least recently called by this queue"
 msgstr ""
-"De opgegeven PIN is niet geldig. Alleen cijfers zijn toegestaan voor dit "
-"type."
 
-#: 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:139
+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 "Het nummer '%s' is geen geldig telefoonnummer!"
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+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:141
+msgid "round robin with memory, remember where we left off last ring pass"
+msgstr ""
 
-#: 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"
+#: 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 ""
-"De bevat '%s' bevat ongeldige karakters. '!,#' worden gebruikt als "
-"scheidingstekens"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
+#: plugins/admin/ogroups/class_phonequeue.inc:184
+msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#: 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/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #, php-format
-msgid "Removed user '%s' from phone queue '%s'."
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Telefoonnummers"
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Stuur oproepen door naar"
+#: 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/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Telefoonnummer"
+#: 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/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Timeout (s)"
+#: plugins/gofon/macro/headpage.tpl:6
+msgid "List of macros"
+msgstr "Lijst met macro's"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
-msgid "Phone macro"
-msgstr "Telefoon macro"
+#: 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/phoneaccount/generic.tpl:67
+#: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
-msgid "fill out"
-msgstr "Uitloggen"
+msgid "Display macros matching"
+msgstr "Toon overeenkomende macro's"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
-msgstr "Telefoon PIN"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Toon overeenkomende macro's"
+
+#: plugins/gofon/macro/headpage.tpl:41
+msgid "Regular expression for matching macro names"
+msgstr "Reguliere expressie voor overeenkomende macronamen"
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Macronaam"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr "Weer te geven macronaam"
+
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Selecteer de subtree waaronder deze macro geplaatst wordt"
+
+#: plugins/gofon/macro/generic.tpl:43
+msgid "Visible for user"
+msgstr "Zichtbaar voor gebruikers"
+
+#: plugins/gofon/macro/generic.tpl:52
+msgid "Macro text"
+msgstr "Macro tekst"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Telefoon rapporten"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+msgid "Phone macros"
+msgstr "Telefoon macro's"
 
-#: 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: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/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: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/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:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Telefoon account aanmaken"
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Bron"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Variabele"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Doel"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+msgid "This table displays all phone macros, in the selected tree."
+msgstr ""
 
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Kanaal"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Macro tekst"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Tijdsduur"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Publiek zichtbaar"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Telefoon rapporten"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Publiek zichtbaar"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6656,141 +6556,241 @@ msgstr "De macro lengte moet minder dan 100 regels zijn"
 msgid "Please choose a valid  base."
 msgstr "Geef a.u.b. een geldige basis op."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Macronaam"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argument"
 
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr "Weer te geven macronaam"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "type"
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Selecteer de subtree waaronder deze macro geplaatst wordt"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+msgid "String"
+msgstr "Tekstregel"
 
-#: plugins/gofon/macro/generic.tpl:43
-msgid "Visible for user"
-msgstr "Zichtbaar voor gebruikers"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
+msgstr "Combobox"
 
-#: plugins/gofon/macro/generic.tpl:52
-msgid "Macro text"
-msgstr "Macro tekst"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr "Bool"
 
-#: plugins/gofon/macro/headpage.tpl:6
-msgid "List of macros"
-msgstr "Lijst met macro's"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+msgid "Delete unused"
+msgstr "Verwijder ongebruikte"
 
-#: 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_gofonMacroParameters.inc:321
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 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."
+"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
 
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Toon overeenkomende macro's"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
+#, 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/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Toon overeenkomende macro's"
+#: 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/headpage.tpl:41
-msgid "Regular expression for matching macro names"
-msgstr "Reguliere expressie voor overeenkomende macronamen"
+#: 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/main.inc:38 plugins/gofon/macro/main.inc:40
 msgid "Phone macro management"
 msgstr "Telefoon macrobeheer"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
-msgid "String"
-msgstr "Tekstregel"
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Telefoonnummers"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
-msgstr "Combobox"
+#: plugins/gofon/phoneaccount/generic.tpl:40
+msgid "Forward calls to"
+msgstr "Stuur oproepen door naar"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
-msgstr "Bool"
+#: plugins/gofon/phoneaccount/generic.tpl:42
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Phone number"
+msgstr "Telefoonnummer"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
-msgid "Delete unused"
-msgstr "Verwijder ongebruikte"
+#: plugins/gofon/phoneaccount/generic.tpl:44
+msgid "Timeout (s)"
+msgstr "Timeout (s)"
+
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:61
+msgid "Phone macro"
+msgstr "Telefoon macro"
+
+#: plugins/gofon/phoneaccount/generic.tpl:67
+#, fuzzy
+msgid "fill out"
+msgstr "Uitloggen"
+
+#: plugins/gofon/phoneaccount/generic.tpl:78
+msgid "Phone PIN"
+msgstr "Telefoon PIN"
+
+#: 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 "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/gofon/phoneaccount/class_phoneAccount.inc:621
+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:624
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
+msgid "Create phone account"
+msgstr "Telefoon account aanmaken"
+
+#: 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 ""
+"Dit account heeft telefoon mogelijkheden uitgeschakeld. U kunt deze "
+"inschakelen door de knop hieronder te gebruiken."
+
+#: 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/gofon/phoneaccount/class_phoneAccount.inc:641
+msgid "Please enter a valid phone number!"
+msgstr "Voer a.u.b. een geldig telefoonnummer in!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
+msgid "Choose your private phone"
+msgstr "Kies uw privé telefoon"
+
+#: 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/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/gofon/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:827
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgid "The given PIN is not valid, only numbers are allowed for this type."
 msgstr ""
-"Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
+"De opgegeven PIN is niet geldig. Alleen cijfers zijn toegestaan voor dit "
+"type."
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr "De parameter %s heeft een incorrecte waarde voor het type boolean."
+msgid "The given PIN is too short"
+msgstr "De opgegeven PIN is te kort"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
+msgid "The number '%s' is no valid phone number!"
+msgstr "Het nummer '%s' is geen geldig telefoonnummer!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-msgid "Phone macros"
-msgstr "Telefoon macro's"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#, php-format
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "De timeout '%s' bevat ongeldige karakters!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
 #, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "U staat op het punt de macro '%s' te verwijderen."
+msgid "Removed user '%s' from phone queue '%s'."
+msgstr ""
 
-#: 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/main.inc:5
+msgid "Phone reports"
+msgstr "Telefoon rapporten"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "Variabele"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Telefoon rapporten"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: 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/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argument"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Doel"
 
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "type"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Kanaal"
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Tijdsduur"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6837,12 +6837,41 @@ 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 ""
 "Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 msgid "Toggle information"
 msgstr "Informatie weergeven/verbergen"
 
@@ -7057,24 +7086,6 @@ msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
 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."
@@ -7086,150 +7097,61 @@ 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_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 ""
-"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
-"bestaat niet."
-
-#: include/class_plugin.inc:454
-#, php-format
-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_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-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-"Kan SSHA niet gebruiken voor encryptie. (Ontbrekende functie mhash / sha1)"
-
-#: include/class_password-methods.inc:165
-#, php-format
-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:202
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-"De instelling voor 'SMBHASH' in /etc/gosa/gosa.conf is niet correct. Kan het "
-"samba wachtwoord niet veranderen."
-
-#: 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/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 ""
-"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"
-
-#: 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"
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Kan het opgegeven bestand niet openen. Controleer of het bestand bestaat en "
-"toegankelijk is."
+"Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
+"bestaat niet."
 
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
+#: 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 ""
-"Kan het opgegeven certificaat niet lezen of er is een lege string opgegeven."
+"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
+"bestaat niet."
 
-#: include/class_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: include/class_plugin.inc:454
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"Kan het certificaat niet laden. Mogelijk is een niet ondersteund formaat "
-"gebruikt (gebruik PEM/DER)."
+"Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
+"bestaat niet."
 
-#: 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_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+"Kan SSHA niet gebruiken voor encryptie. (Ontbrekende functie mhash / sha1)"
 
-#: include/class_certificate.inc:192
-msgid "Can't create/open File"
-msgstr "Kan bestand niet aanmaken/openen"
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr "Instellen van het wachtwoord is mislukt. De LDAP server meldt: '%s'."
 
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
-msgstr "Geen geldig certificaat geladen"
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"De instelling voor 'SMBHASH' in /etc/gosa/gosa.conf is niet correct. Kan het "
+"samba wachtwoord niet veranderen."
 
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %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 ""
-"%s resultaten voor uw zoekopdracht met sleutelwoord %s geinterpreteerd als %s"
+"Uw gosa.conf is gedeeltelijk veranderd. Converteer het a.u.b. met het "
+"meegeleverde script fix_config.sh!"
 
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr "%s%% resultaat in bestand %s"
+#: 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/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7696,6 +7618,84 @@ 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"
+
+#: 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!"
+
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr "Help is niet beschikbaar als u niet ingelogd bent."
@@ -7716,6 +7716,11 @@ msgstr ""
 "Kon geen helpbestanden lezen van '%s'. Het is mogelijk dat help niet "
 "beschikbaar is."
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+"Fout: getvcard.php heeft een parameter nodig om een vcard te exporteren!"
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Kan niet verbinden met de database server!"
@@ -7728,11 +7733,6 @@ msgstr "De opgegeven database kon niet geselecteerd worden!"
 msgid "Database query failed!"
 msgstr "De database zoekopdracht is mislukt"
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-"Fout: getvcard.php heeft een parameter nodig om een vcard te exporteren!"
-
 #: html/setup.php:86
 #, php-format
 msgid ""
@@ -7743,7 +7743,7 @@ msgstr ""
 "toegankelijk! Controleer of deze directory bestaat en wat de rechten op deze "
 "directory zijn!"
 
-#: html/main.php:96
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -7751,18 +7751,18 @@ msgstr ""
 "'Register globals' is geactiveerd in PHP. GOsa zal niemand laten inloggen "
 "totdat dit opgelost is door een systeembeheerder."
 
-#: html/main.php:139
+#: html/main.php:155
 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
+#: html/main.php:284
 #, 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
+#: html/main.php:313
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
@@ -7844,6 +7844,23 @@ 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/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/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Er is een sessie conflict gedetecteerd"
@@ -7874,23 +7891,6 @@ 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!"
@@ -7914,6 +7914,24 @@ 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/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7934,24 +7952,6 @@ msgstr "Uitloggen"
 msgid "Signed in:"
 msgstr "Aangemeld:"
 
-#: 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 "Installatie vervolg..."
-
-#: 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 ""
-"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"
@@ -7966,23 +7966,23 @@ msgstr ""
 "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_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 "Installatie vervolg..."
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 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."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 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."
+"Stap twee zoekt naar een collectie hulpprogramma's en controleert of deze "
+"programma's de correcte minimum versies hebben."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4

diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po
index eb4f43dd92264e12bb076ec7586a21911210069a..983db791a8ecc3cd2eeff9bc19f383bbbaf6a953 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -149,9 +149,9 @@ msgid "Export"
 msgstr "Экспорт"
 
 #: contrib/gosa.conf:152 plugins/personal/mail/generic.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 msgid "Import"
 msgstr "Импортировать"
 
@@ -192,153 +192,140 @@ 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/mail_locals.tpl:6
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+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/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/gofax/blocklists/headpage.tpl:29
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/admin/groups/headpage.tpl:30
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
+#: plugins/admin/applications/headpage.tpl:29
+#: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/headpage.tpl:29 plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+msgid "Filters"
+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/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+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/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+msgid "Choose the department the search will be based on"
+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/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+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/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Регулярное выражение для поиска адреса"
 
-#: plugins/personal/mail/class_mailAccount.inc:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "Ð\97наÑ\87ение полÑ\8f \"Ð\9aвоÑ\82а\" некоÑ\80Ñ\80екÑ\82но."
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Ð\9fоказаÑ\82Ñ\8c адÑ\80еÑ\81а полÑ\8cзоваÑ\82елÑ\8f"
 
-#: 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 "УкажиÑ\82е коÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\80азмеÑ\80 Ñ\81ообÑ\89ений, коÑ\82оÑ\80Ñ\8bе бÑ\83дÑ\83Ñ\82 оÑ\82клонÑ\8fÑ\82Ñ\8cÑ\81Ñ\8f."
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Ð\98мÑ\8f полÑ\8cзоваÑ\82елÑ\8f, адÑ\80еÑ\81 коÑ\82оÑ\80ого показан"
 
-#: 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/mail_locals.tpl:41
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: 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/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/generic.tpl:88
+#: plugins/admin/groups/group_objects.tpl:49
+#: 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/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
+msgid "Add"
+msgstr "Добавить"
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
+#: 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/main.inc:160
+#: plugins/personal/generic/generic_certs.tpl:78
+#: 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/remove.tpl:17
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_locals.tpl:70
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/users/remove.tpl:17 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:612
+#: plugins/admin/users/template.tpl:46
+#: 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/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/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
@@ -380,38 +367,6 @@ msgstr "Альтернативные адреса"
 msgid "List of alternative mail addresses"
 msgstr "Список альтернативных адресов эл. почты"
 
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
-#: plugins/personal/mail/mail_locals.tpl:41
-#: 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/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
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:49
-#: 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/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:710
-#: plugins/gofon/phoneaccount/generic.tpl:13
-msgid "Add"
-msgstr "Добавить"
-
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
@@ -428,13 +383,13 @@ msgstr "Добавить"
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: 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/remove.tpl:15
 #: 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/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:14
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96 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
 msgid "Delete"
 msgstr "Удалить"
 
@@ -523,9 +478,8 @@ msgid "disables all Mail options!"
 msgstr "отключает все почтовые настройки!"
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
 #: 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
@@ -535,52 +489,11 @@ msgstr "отключает все почтовые настройки!"
 #: 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
+#: 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/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
 #: plugins/personal/connectivity/main.inc:126
@@ -603,117 +516,192 @@ msgstr "Изменить"
 msgid "User mail settings"
 msgstr "Почтовые настройки пользователя"
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-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/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:29
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
-msgid "Filters"
-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/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Показать адреса подразделения"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "В файле сообщения автоответчика отсутствует тег DESC:"
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: 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
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Выбрать раздел, для которого будет осуществлен поиск"
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "В этой учетной записи нет почтовых расширений."
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-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/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-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/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-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/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-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/password/class_password.inc:5
-#: 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 ihtml/themes/altlinux/login.tpl:35
-#: ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/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/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку тех, "
+"кому должны пересылаться сообщения."
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
-msgid "Change password"
-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/password/password.tpl:6
-#, fuzzy
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
 msgid ""
-"To change your personal password use the fields below. The changes take "
-"effect immediately. Please memorize the new password, because you wouldn't "
-"be able to login without it."
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
 msgstr ""
-"В полях ниже вы можете изменить свой пароль. Изменения вступят в силу "
-"немедленно. Пожалуйста, запомните новый пароль, так как иначе вы не сможете "
-"войти в систему."
+"Вы пытаетесь добавить некорректный адрес электронной почты к списку "
+"альтернативных адресов."
 
-#: plugins/personal/password/password.tpl:10
-#: plugins/admin/users/password.tpl:6
-#, fuzzy
+#: 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 ""
-"Changing the password affects your authentification on mail, proxy, samba "
-"and unix services."
+"There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
-"Изменение пароля влияет на аутентификацию при использовании почты, прокси-"
-"сервера, Samba и служб UNIX."
-
-#: plugins/personal/password/password.tpl:15
-msgid "Current password"
-msgstr "Текущий пароль"
 
-#: plugins/personal/password/password.tpl:20
-#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:11
-msgid "New password"
-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/password/password.tpl:25
+#: 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/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:659
+msgid "Change password"
+msgstr "Сменить пароль"
+
+#: plugins/personal/password/password.tpl:6
+#, fuzzy
+msgid ""
+"To change your personal password use the fields below. The changes take "
+"effect immediately. Please memorize the new password, because you wouldn't "
+"be able to login without it."
+msgstr ""
+"В полях ниже вы можете изменить свой пароль. Изменения вступят в силу "
+"немедленно. Пожалуйста, запомните новый пароль, так как иначе вы не сможете "
+"войти в систему."
+
+#: plugins/personal/password/password.tpl:10
+#: plugins/admin/users/password.tpl:6
+#, fuzzy
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
+msgstr ""
+"Изменение пароля влияет на аутентификацию при использовании почты, прокси-"
+"сервера, Samba и служб UNIX."
+
+#: plugins/personal/password/password.tpl:15
+msgid "Current password"
+msgstr "Текущий пароль"
+
+#: plugins/personal/password/password.tpl:20
+#: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
+#: plugins/admin/systems/password.tpl:11
+msgid "New password"
+msgstr "Новый пароль"
+
+#: plugins/personal/password/password.tpl:25
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
 msgid "Repeat new password"
@@ -739,11 +727,11 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1279
-#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
+#: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
@@ -755,6 +743,18 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
+#: plugins/personal/password/class_password.inc:5
+#: 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 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+msgid "Password"
+msgstr "Пароль"
+
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -793,18 +793,65 @@ 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/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:65
+#: plugins/personal/samba/class_sambaAccount.inc:626
+msgid "Home directory"
+msgstr "Домашний каталог"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81иÑ\81Ñ\82емÑ\8b в подÑ\80азделении"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Ð\9eболоÑ\87ка"
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Показать подходяшие системы"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "Основная группа"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
+#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Состояние"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Указать UID/GID вручную"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Членство в группах"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr ""
+"(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Учетная запись"
+
+#: plugins/personal/posix/generic.tpl:98
+msgid "Environment"
+msgstr "Окружение"
+
+#: plugins/personal/posix/generic.tpl:101
+msgid "Default printer"
+msgstr "Принтер по умолчанию"
+
+#: plugins/personal/posix/generic.tpl:110
+msgid "Default language"
+msgstr "Язык по умолчанию"
+
+#: plugins/personal/posix/generic.tpl:123
+msgid "System trust"
+msgstr "Системные доверия"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -894,65 +941,18 @@ msgstr "Пользователь должен сменить пароль при
 msgid "Password expires on"
 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
-msgid "Home directory"
-msgstr "Домашний каталог"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Оболочка"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Основная группа"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
-#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Состояние"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Указать UID/GID вручную"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Членство в группах"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr ""
-"(Предупреждение: NFS не поддерживает более 16 групп для одного пользователя!)"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Учетная запись"
-
-#: plugins/personal/posix/generic.tpl:98
-msgid "Environment"
-msgstr "Окружение"
-
-#: plugins/personal/posix/generic.tpl:101
-msgid "Default printer"
-msgstr "Принтер по умолчанию"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Выберите системы для добавления"
 
-#: plugins/personal/posix/generic.tpl:110
-msgid "Default language"
-msgstr "ЯзÑ\8bк по Ñ\83молÑ\87аниÑ\8e"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\81иÑ\81Ñ\82емÑ\8b в подÑ\80азделении"
 
-#: plugins/personal/posix/generic.tpl:123
-msgid "System trust"
-msgstr "Системные доверия"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Показать подходяшие системы"
 
 #: plugins/personal/posix/main.inc:131
 msgid "Unix settings"
@@ -1658,16 +1658,6 @@ msgstr "Значение поля \"Пейджер\" содержит некор
 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 "Личная информация"
@@ -1684,8 +1674,8 @@ 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/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Фамилия"
@@ -1729,9 +1719,9 @@ msgstr "Пол"
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:21
-#: plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
+#: plugins/admin/systems/printer.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20
@@ -1900,6 +1890,16 @@ msgstr "Последняя доставка"
 msgid "Public visible"
 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_picture.tpl:23
 msgid "Remove picture"
 msgstr "Удалить изображение"
@@ -1909,6 +1909,14 @@ msgstr "Удалить изображение"
 msgid "Save"
 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/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Стандартный сертификат"
@@ -1936,42 +1944,10 @@ msgstr "Сертификат PKCS12"
 msgid "Certificate serial number"
 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/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/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
+#: plugins/personal/connectivity/intranet.tpl:1
+#, fuzzy
+msgid "Intranet account"
+msgstr "Создать телефонный аккаунт"
 
 #: plugins/personal/connectivity/proxy.tpl:16
 msgid "Proxy account"
@@ -1995,78 +1971,63 @@ msgstr "Ограничить квотой использование прокс
 msgid "per"
 msgstr "per"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:5
-msgid "Kolab"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "Аккаунт FTP"
 
-#: 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/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+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/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Пропускная способность (на сервер)"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
-msgid "Always accept"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "Кб/с"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
-msgid "Always reject"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Пропускная способность (с сервера)"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
-#, fuzzy
-msgid "Reject if conflicts"
-msgstr "В"
+#: plugins/personal/connectivity/pureftpd.tpl:31
+msgid "Quota"
+msgstr "Квота"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
-msgid "Manual if conflicts"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "Файлы"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
-#, fuzzy
-msgid "Manual"
-msgstr "Январь"
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Размер"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
-msgid "Anonymous"
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+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/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "Загрузка на сервер / с сервера"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
-#, fuzzy
-msgid "The value specified as Free Busy Information URL is invalid."
-msgstr "Значение поля \"Файлы\" некорректно."
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Отметьте, чтобы отключить доступ к FTP"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
-#, php-format
-msgid "The invitation policy entry for address '%s' is not valid."
-msgstr ""
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Временно отключить доступ к FTP"
 
-#: 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/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "Учетная запись Groupware"
 
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "Учетная запись Groupware"
-
 #: plugins/personal/connectivity/kolab.tpl:1
 #, fuzzy
 msgid "Kolab account"
@@ -2116,98 +2077,6 @@ 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"
-
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Пропускная способность"
-
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Пропускная способность (на сервер)"
-
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "Кб/с"
-
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Пропускная способность (с сервера)"
-
-#: plugins/personal/connectivity/pureftpd.tpl:31
-msgid "Quota"
-msgstr "Квота"
-
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "Файлы"
-
-#: plugins/personal/connectivity/pureftpd.tpl:39
-msgid "Size"
-msgstr "Размер"
-
-#: plugins/personal/connectivity/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Отношение"
-
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "Загрузка на сервер / с сервера"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Отметьте, чтобы отключить доступ к FTP"
-
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Временно отключить доступ к FTP"
-
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr ""
@@ -2243,15 +2112,6 @@ 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"
@@ -2290,26 +2150,216 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "Значение поля \"Квота\" некорректно."
 
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Учетная запись WebDAV"
+
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Список"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Имя стоп-листа"
+#: plugins/personal/connectivity/class_kolabAccount.inc:5
+msgid "Kolab"
+msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-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:32
-#: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:122
-msgid "Type"
+#: 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/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
+#, fuzzy
+msgid "Reject if conflicts"
+msgstr "В"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
+msgid "Manual if conflicts"
+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/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/class_connectivity.inc:60
+msgid "This account has no connectivity extensions."
+msgstr "В этой учетной записи нет атрибутов для подключения."
+
+#: plugins/gofax/blocklists/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Стоп-листы"
+
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:67
+#: 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/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные стоп-"
+"листы. Если у вас достаточно большое количество списков, вы можете "
+"использовать групповое выделение."
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Выберите, чтобы просмотреть стоп-листы (отправка)"
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr "Показать стоп-листы отправки"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr "Выберите, чтобы просмотреть стоп-листы (получение)"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr "Показать стоп-листы получения"
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr "Шаблон для стоп-листов"
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+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
@@ -2336,17 +2386,6 @@ msgstr "Описание стоп-листа"
 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 "Вместо точных номеров можно использовать шаблоны."
@@ -2602,45 +2641,6 @@ msgstr ""
 "Если вы уверены в своих действиях, нажмите на кнопку <i>Удалить</i>, иначе "
 "нажмите <i>Отмена</i>."
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Стоп-листы"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные стоп-"
-"листы. Если у вас достаточно большое количество списков, вы можете "
-"использовать групповое выделение."
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Выберите, чтобы просмотреть стоп-листы (отправка)"
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Показать стоп-листы отправки"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Выберите, чтобы просмотреть стоп-листы (получение)"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Показать стоп-листы получения"
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Шаблон для стоп-листов"
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Регулярное выражение, соответствующее именам списков"
-
 #: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
 msgid "Blocklist management"
 msgstr "Управление \"черными списками\""
@@ -2747,8 +2747,8 @@ msgid "List of predefined blocklists"
 msgstr "Готовые \"черные списки\""
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1270
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1270
 msgid "Apply"
 msgstr "Применить"
 
@@ -2818,65 +2818,16 @@ msgid ""
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr "Предварительный просмотр - пожалуйста, подождите"
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr "Щелкните по факсу, чтобы загрузить его"
+#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
+#: plugins/gofon/reports/contents.tpl:2
+msgid "Filter"
+msgstr "Фильтр"
 
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr "Идентификатор факса"
-
-#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr "Пользователь"
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr "Дата / время"
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr "MSN отправителя"
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr "Идентификатор отправителя"
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr "MSN получателя"
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr "Идентификатор получателя"
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr "Сообщение о состоянии"
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr "Время передачи"
-
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr "Число страниц"
-
-#: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
-#: plugins/gofon/reports/contents.tpl:2
-msgid "Filter"
-msgstr "Фильтр"
-
-#: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
-msgid "Search for"
-msgstr "Поиск"
+#: plugins/gofax/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+msgid "Search for"
+msgstr "Поиск"
 
 #: plugins/gofax/reports/contents.tpl:7 plugins/gofon/reports/contents.tpl:7
 msgid "Enter user name to search for"
@@ -2901,6 +2852,11 @@ msgstr "в течение"
 msgid "Search"
 msgstr "Поиск"
 
+#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+msgid "User"
+msgstr "Пользователь"
+
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -2915,12 +2871,60 @@ msgstr "Отправитель"
 msgid "Receiver"
 msgstr "Получатель"
 
+#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
+msgid "# pages"
+msgstr "Число страниц"
+
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "Не найдено..."
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr "Предварительный просмотр - пожалуйста, подождите"
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr "Щелкните по факсу, чтобы загрузить его"
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr "Идентификатор факса"
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr "Дата / время"
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr "MSN отправителя"
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr "Идентификатор отправителя"
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr "MSN получателя"
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr "Идентификатор получателя"
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr "Сообщение о состоянии"
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr "Время передачи"
+
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Отчеты о факсах"
+
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Отчеты о факсах"
@@ -2951,10 +2955,6 @@ msgstr "У вас недостаточно прав для получения и
 msgid "Y-M-D"
 msgstr "Г-М-Д"
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Отчеты о факсах"
-
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -3032,6 +3032,15 @@ msgstr "Соединение..."
 msgid "Dial"
 msgstr "Звонок"
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Это включает все объекты адресной книги. Проверте действительно ли это так, "
+"поскольку GOsa не сможет отменить результаты этой операции."
+
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr "Выбрать раздел, для хранения объекта"
@@ -3071,15 +3080,6 @@ msgstr "Город"
 msgid "Country"
 msgstr "Страна"
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. Please double check if "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"Это включает все объекты адресной книги. Проверте действительно ли это так, "
-"поскольку GOsa не сможет отменить результаты этой операции."
-
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Адресная книга"
@@ -3172,6 +3172,51 @@ msgstr ""
 "У вас недостаточно прав для создания или изменения объекта в общей адресной "
 "книге."
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+msgid "Browse"
+msgstr "Просмотр"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+#, fuzzy
+msgid "Select template"
+msgstr "Создать шаблон"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+#, fuzzy
+msgid "Selected Template"
+msgstr "Выберите режим терминала"
+
+#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+#, fuzzy
+msgid "LDAP manager"
+msgstr "Экспорт в LDIF"
+
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3244,11 +3289,6 @@ msgstr ""
 msgid "Import LDIF File"
 msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr "Просмотр"
-
 #: plugins/addons/ldapmanager/contentimport.tpl:24
 msgid "Modify existing attributes"
 msgstr ""
@@ -3263,40 +3303,6 @@ msgstr "Экспорт объекта"
 msgid "Import successful"
 msgstr "Импорт успешен."
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-#, fuzzy
-msgid "Select template"
-msgstr "Создать шаблон"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr ""
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-#, fuzzy
-msgid "Selected Template"
-msgstr "Выберите режим терминала"
-
 #: plugins/addons/ldapmanager/class_import.inc:38
 #, fuzzy
 msgid "You've no permission to do LDAP imports."
@@ -3347,12 +3353,6 @@ msgstr "Щелкните здесь, чтобы сохранить образ б
 msgid "Click here to save the LDAP Export "
 msgstr "Щелкните здесь, чтобы сохранить результаты экспорта"
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:23
-#, fuzzy
-msgid "LDAP manager"
-msgstr "Экспорт в LDIF"
-
 #: plugins/addons/ldapmanager/class_export.inc:7
 #, fuzzy
 msgid "CSV import"
@@ -3367,6 +3367,42 @@ msgstr "У вас недостаточно прав для удаления эт
 msgid "Error while exporting the requested entries!"
 msgstr ""
 
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr "Показать хосты"
+
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr "Уровень информативности"
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr "Интервал времени"
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr "Введите строку для поиска"
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr "Набор правил"
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr "Уровень"
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr "Имя системы"
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr "Сообщение"
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr "Просмотр системного журнала"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Системные журналы"
@@ -3422,88 +3458,20 @@ msgstr "один месяц"
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Показать хосты"
-
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Уровень информативности"
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Список групп"
 
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Интервал времени"
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Введите строку для поиска"
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Набор правил"
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Уровень"
-
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Имя системы"
-
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Сообщение"
-
-#: plugins/addons/logview/main.inc:23
-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
+#: plugins/admin/groups/headpage.tpl:25
+#, fuzzy
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"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/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"
@@ -3529,20 +3497,14 @@ 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
+#: plugins/admin/groups/remove.tpl:7
 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."
+"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 ""
-"С помоÑ\89Ñ\8cÑ\8e Ñ\8dÑ\82ого менÑ\8e вÑ\8b можеÑ\82е добавлÑ\8fÑ\82Ñ\8c, изменÑ\8fÑ\82Ñ\8c и Ñ\83далÑ\8fÑ\82Ñ\8c вÑ\8bбÑ\80аннÑ\8bе "
-"гÑ\80Ñ\83ппÑ\8b полÑ\8cзоваÑ\82елей. Ð\95Ñ\81ли Ñ\83 ваÑ\81 иÑ\85 доÑ\81Ñ\82аÑ\82оÑ\87но болÑ\8cÑ\88ое колиÑ\87еÑ\81Ñ\82во, вÑ\8b можеÑ\82е "
-"использовать групповое выделение."
+"Ð\92озможно, Ñ\8dÑ\82о оÑ\81новнаÑ\8f гÑ\80Ñ\83ппа полÑ\8cзоваÑ\82елей. Ð\95Ñ\89е Ñ\80аз пÑ\80овеÑ\80Ñ\82е Ñ\87Ñ\82о Ð\92Ñ\8b "
+"дейÑ\81Ñ\82виÑ\82елÑ\8cно Ñ\85оÑ\82иÑ\82е Ñ\83далиÑ\82Ñ\8c ее, Ñ\82ак как GOsa не Ñ\81можеÑ\82 оÑ\82мениÑ\82Ñ\8c Ñ\80езÑ\83лÑ\8cÑ\82аÑ\82Ñ\8b "
+"этой операции."
 
 #: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
 msgid "Group administration"
@@ -3623,18 +3585,76 @@ msgstr "Свойства"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: 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 ""
-"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."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 msgstr ""
-"Возможно, это основная группа пользователей. Еще раз проверте что Вы "
-"действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
-"этой операции."
+"Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
+"буквы в нижнем регистре, цифры и дефисы."
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-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/application.tpl:4
+msgid "Used applications"
+msgstr "Используемые приложения"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Изменить параметры"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Изменить дополнительные параметры приложения"
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr "Доступные приложения"
+
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Объект"
+
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Применить эти права доступа только к собственным записям пользователей"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3682,55 +3702,9 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Введите корректный серийный номер"
 
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Объект"
-
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Применить эти права доступа только к собственным записям пользователей"
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Используемые приложения"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Изменить параметры"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Изменить дополнительные параметры приложения"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Доступные приложения"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Выбрать пользователей для добавления"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr "Подразделение"
-
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/users/headpage.tpl:48
-msgid "Display users matching"
-msgstr "Фильтр"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr "Регулярное выражение, соответствующее именам пользователей"
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr "Это DN не содержит ACL."
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-msgid "All fields are writeable"
-msgstr "Все поля доступны для записи"
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Администраторы папки"
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -3778,9 +3752,35 @@ msgstr "Члены телефонной группы"
 msgid "Group members"
 msgstr "Члены группы"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Администраторы папки"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Выбрать пользователей для добавления"
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr "Подразделение"
+
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/users/headpage.tpl:48
+msgid "Display users matching"
+msgstr "Фильтр"
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#: plugins/admin/groups/class_groupAcl.inc:54
+msgid "This 'dn' is no acl container."
+msgstr "Это DN не содержит ACL."
+
+#: plugins/admin/groups/class_groupAcl.inc:199
+msgid "All fields are writeable"
+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."
@@ -3824,6 +3824,82 @@ msgstr "У выбранного приложения нет параметров
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Список пользователей"
+
+#: plugins/admin/users/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранных "
+"пользователей. Если у вас достаточно большое количество пользователей, вы "
+"можете использовать групповое выделение."
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Выберите, чтобы просмотреть шаблоны псевдопользователей"
+
+#: plugins/admin/users/headpage.tpl:38
+msgid "Show templates"
+msgstr "Показать шаблоны"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Select to see users that have only a GOsa object"
+msgstr ""
+"Выберите, чтобы просмотреть пользователей, у которых есть только объект GOsa"
+
+#: plugins/admin/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Показать обычных пользователей"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Select to see users that have posix settings"
+msgstr ""
+"Выберите, чтобы просмотреть пользователей с атрибутами в стандарте POSIX"
+
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr "Показать UNIX-пользователей"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Select to see users that have mail settings"
+msgstr "Выберите, чтобы просмотреть пользователей с настройками почты"
+
+#: plugins/admin/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Показать пользователей с почтой"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Select to see users that have samba settings"
+msgstr "Выберите, чтобы просмотреть пользователей с настройками Samba"
+
+#: plugins/admin/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Показать пользователей Samba"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Select to see users that have proxy settings"
+msgstr "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
+
+#: plugins/admin/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Показать пользователей с прокси-серверами"
+
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"Сюда входит вся информация об учетной записи этого пользователя, его права "
+"доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
+"ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
+"операции."
+
 #: plugins/admin/users/password.tpl:2
 #, fuzzy
 msgid ""
@@ -3835,42 +3911,6 @@ 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 ""
-"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
-"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
-"использовать шаблоны."
-
-#: 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 "Пользователи"
@@ -3927,8 +3967,8 @@ msgstr "Пароль"
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: 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
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Имя пользователя"
 
@@ -3990,81 +4030,65 @@ msgstr "в сети"
 msgid "Offline"
 msgstr "не в сети"
 
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Сюда входит вся информация об учетной записи этого пользователя, его права "
-"доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
-"ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
-"операции."
+#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/template.tpl:11
+#: plugins/admin/systems/class_systemManagement.inc:699
+msgid "Template"
+msgstr "Шаблон"
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Создание полÑ\8cзоваÑ\82елÑ\8f на оÑ\81нове Ñ\88аблона"
 
-#: plugins/admin/users/headpage.tpl:24
-#, fuzzy
+#: plugins/admin/users/template.tpl:6
 msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+"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/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Выберите, чтобы просмотреть шаблоны псевдопользователей"
+"Можно создавать пользователей на основе шаблонов. При этом многие поля в "
+"базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
+"использовать шаблоны."
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Show templates"
-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/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr ""
-"Выберите, чтобы просмотреть пользователей, у которых есть только объект GOsa"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Управление пользователями"
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Ð\9fоказаÑ\82Ñ\8c обÑ\8bÑ\87нÑ\8bÑ\85 полÑ\8cзоваÑ\82елей"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "СпиÑ\81ок пÑ\80иложений"
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
+#: plugins/admin/applications/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
 msgstr ""
-"Выберите, чтобы просмотреть пользователей с атрибутами в стандарте POSIX"
-
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Показать UNIX-пользователей"
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками почты"
-
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Показать пользователей с почтой"
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками Samba"
-
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Показать пользователей Samba"
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"приложения. Если у вас достаточно большое количество приложений, вы можете "
+"использовать групповое выделение."
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
+#: plugins/admin/applications/headpage.tpl:38
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Display applications matching"
+msgstr "Шаблон для приложений"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Ð\9fоказаÑ\82Ñ\8c полÑ\8cзоваÑ\82елей Ñ\81 пÑ\80окÑ\81и-Ñ\81еÑ\80веÑ\80ами"
+#: plugins/admin/applications/headpage.tpl:44
+msgid "Regular expression for matching application names"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам пÑ\80иложений"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -4073,7 +4097,7 @@ msgid "Application name"
 msgstr "Приложение"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
 #: plugins/admin/systems/workstation.tpl:109
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
@@ -4174,56 +4198,11 @@ msgstr ""
 "действительно ли вы хотите удалить его, так как GOsa не сможет отменить "
 "результаты этой операции."
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Список приложений"
-
-#: plugins/admin/applications/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"приложения. Если у вас достаточно большое количество приложений, вы можете "
-"использовать групповое выделение."
-
-#: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Display applications matching"
-msgstr "Шаблон для приложений"
-
-#: plugins/admin/applications/headpage.tpl:44
-msgid "Regular expression for matching application names"
-msgstr "Регулярное выражение, соответствующее именам приложений"
-
 #: plugins/admin/applications/main.inc:38
 #: plugins/admin/applications/main.inc:40
 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 соответствует не приложению."
@@ -4248,6 +4227,50 @@ 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/headpage.tpl:6
+msgid "List of departments"
+msgstr "Список подразделений"
+
+#: plugins/admin/departments/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"подразделения. Если у вас достаточно большое количество подразделений, вы "
+"можете использовать групповое выделение."
+
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr "Шаблон для подразделений"
+
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
+msgstr "Регулярное выражение, соответствующее именам подразделений"
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Подразделение"
@@ -4312,32 +4335,30 @@ msgstr ""
 "файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
 "<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "СпиÑ\81ок подÑ\80азделений"
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
+msgstr "УпÑ\80авление подÑ\80азделениÑ\8fми"
 
-#: plugins/admin/departments/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
-msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"подразделения. Если у вас достаточно большое количество подразделений, вы "
-"можете использовать групповое выделение."
+#: plugins/admin/departments/class_departmentGeneric.inc:133
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-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/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам подÑ\80азделений"
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+msgid "Required field 'Description' is not set."
+msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9eпиÑ\81ание\" не заполнено."
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
-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
@@ -4382,26 +4403,17 @@ 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/systems/network.tpl:1
+msgid "Network settings"
+msgstr "Сетевые настройки"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:155
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
+msgstr "IP-адрес"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-msgid " Please choose another name."
-msgstr " Введите другое имя."
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr "MAC-адрес"
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
@@ -4439,50 +4451,45 @@ msgstr "состояние неизвестно"
 msgid "offline"
 msgstr "не в сети"
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Сетевые настройки"
+#: plugins/admin/systems/servservice.tpl:11
+#, fuzzy
+msgid "Nfs Export"
+msgstr "Экспорт"
 
-#: plugins/admin/systems/network.tpl:8
-msgid "IP-address"
-msgstr "IP-адрес"
+#: plugins/admin/systems/servservice.tpl:37
+#, fuzzy
+msgid "Time Service"
+msgstr "Сервисы"
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr "MAC-адрес"
+#: plugins/admin/systems/servservice.tpl:61
+#, fuzzy
+msgid "LDAP Service"
+msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/class_servService.inc:177
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
+#: plugins/admin/systems/servservice.tpl:72
+#, fuzzy
+msgid "Terminal Service"
+msgstr "Терминальный сервер"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
+#: plugins/admin/systems/servservice.tpl:77
 #, fuzzy
-msgid "This 'dn' has no network features."
-msgstr "ЭÑ\82оÑ\82 DN не имееÑ\82 Ñ\81войÑ\81Ñ\82в пÑ\80инÑ\82еÑ\80а."
+msgid "Temporary disable login"
+msgstr "Ð\92Ñ\80еменно оÑ\82клÑ\8eÑ\87иÑ\82Ñ\8c иÑ\81полÑ\8cзование Ñ\84акÑ\81а"
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
+#: plugins/admin/systems/servservice.tpl:80
 #, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "Ð\9eбÑ\8fзаÑ\82елÑ\8cное поле \"Ð\9bиÑ\87ное имÑ\8f\" не заполнено."
+msgid "Font path"
+msgstr "Ð\9aонÑ\82акÑ\82"
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
+#: plugins/admin/systems/servservice.tpl:93
 #, fuzzy
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f Ñ\82елеÑ\84онов в Ñ\8dÑ\82ой веÑ\82ке."
+msgid "Syslog Service"
+msgstr "СеÑ\80веÑ\80 Ñ\81иÑ\81Ñ\82емнÑ\8bÑ\85 жÑ\83Ñ\80налов"
 
-#: plugins/admin/systems/class_winGeneric.inc:163
-#: plugins/admin/systems/class_terminalGeneric.inc:236
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:136
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "В выбранной вами ветке уже есть запись \"%s\""
+#: plugins/admin/systems/servservice.tpl:101
+#, fuzzy
+msgid "Print Service"
+msgstr "Служба печати"
 
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
@@ -4581,147 +4588,55 @@ 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
-#, fuzzy
-msgid "Nfs Export"
-msgstr "Экспорт"
-
-#: plugins/admin/systems/servservice.tpl:37
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
 #, fuzzy
-msgid "Time Service"
-msgstr "СеÑ\80виÑ\81Ñ\8b"
+msgid "This 'dn' has no network features."
+msgstr "ЭÑ\82оÑ\82 DN не имееÑ\82 Ñ\81войÑ\81Ñ\82в пÑ\80инÑ\82еÑ\80а."
 
-#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
 #, fuzzy
-msgid "LDAP Service"
-msgstr "LDAP-сервер"
+msgid "The required field 'Component name' is not set."
+msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
 #, fuzzy
-msgid "Terminal Service"
-msgstr "ТеÑ\80миналÑ\8cнÑ\8bй Ñ\81еÑ\80веÑ\80"
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "У ваÑ\81 недоÑ\81Ñ\82аÑ\82оÑ\87но пÑ\80ав длÑ\8f Ñ\81озданиÑ\8f Ñ\82елеÑ\84онов в Ñ\8dÑ\82ой веÑ\82ке."
 
-#: plugins/admin/systems/servservice.tpl:77
-#, fuzzy
-msgid "Temporary disable login"
-msgstr "Временно отключить использование факса"
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "В выбранной вами ветке уже есть запись \"%s\""
 
-#: plugins/admin/systems/servservice.tpl:80
-#, fuzzy
-msgid "Font path"
-msgstr "Контакт"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Управление системами"
 
-#: plugins/admin/systems/servservice.tpl:93
-#, fuzzy
-msgid "Syslog Service"
-msgstr "Сервер системных журналов"
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Шаблон терминала"
 
-#: plugins/admin/systems/servservice.tpl:101
-#, fuzzy
-msgid "Print Service"
-msgstr "Служба печати"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+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"
-msgstr "напрямую"
-
-#: plugins/admin/systems/class_terminalService.inc:88
-msgid "load balanced"
-msgstr "с выравниваем нагрузки"
-
-#: plugins/admin/systems/class_terminalService.inc:91
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:92
-msgid "ICA client"
-msgstr "Клиент ICA"
-
-#: plugins/admin/systems/class_terminalService.inc:184
-#, fuzzy
-msgid "Choose the phone located at the current terminal"
-msgstr "Выбрать раздел, для хранения объекта"
-
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-msgid "Please specify a valid VSync range."
-msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
-
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-msgid "Please specify a valid HSync range."
-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/server.tpl:6
-msgid "Server name"
-msgstr "Имя сервера"
-
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:23
-#: plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
+#: plugins/admin/systems/printer.tpl:23
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Выберите ветку терминала"
 
-#: plugins/admin/systems/server.tpl:38 plugins/admin/systems/terminal.tpl:99
-#: plugins/admin/systems/workstation.tpl:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Действие"
-
-#: plugins/admin/systems/server.tpl:42
-#, fuzzy
-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
@@ -4773,11 +4688,93 @@ msgstr "Сервер NTP"
 msgid "Choose server to use for synchronizing time"
 msgstr "Выберите сервер для синхронизации времени"
 
+#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/server.tpl:38
+#: plugins/admin/systems/workstation.tpl:99
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+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_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"
+msgstr "напрямую"
+
+#: plugins/admin/systems/class_terminalService.inc:88
+msgid "load balanced"
+msgstr "с выравниваем нагрузки"
+
+#: plugins/admin/systems/class_terminalService.inc:91
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_terminalService.inc:92
+msgid "ICA client"
+msgstr "Клиент ICA"
+
+#: plugins/admin/systems/class_terminalService.inc:184
+#, fuzzy
+msgid "Choose the phone located at the current terminal"
+msgstr "Выбрать раздел, для хранения объекта"
+
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
+msgid "Please specify a valid VSync range."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
+msgid "Please specify a valid HSync range."
+msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
+
+#: plugins/admin/systems/server.tpl:6
+msgid "Server name"
+msgstr "Имя сервера"
+
+#: plugins/admin/systems/server.tpl:42
+#, fuzzy
+msgid "Select action to execute for this server"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Название"
+
+#: plugins/admin/systems/class_servService.inc:177
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Шаблон рабочей станции"
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+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_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4895,18 +4892,6 @@ 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 не содержит атрибутоов рабочей станции."
@@ -5097,278 +5082,209 @@ msgstr "Шаблон терминала"
 msgid "Workstation template for"
 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"
+msgstr "Служба печати"
 
-#: plugins/admin/systems/class_servDNS.inc:33
-msgid "Remove DNS service"
-msgstr "Удалить сервис DNS"
+#: plugins/admin/systems/servkolab.tpl:22
+#, fuzzy
+msgid "POP3/SSL service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/class_servDNS.inc:34
+#: plugins/admin/systems/servkolab.tpl:30
 #, fuzzy
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
-msgstr ""
-"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
-"ниже."
+msgid "IMAP service"
+msgstr "LDAP-сервер"
 
-#: plugins/admin/systems/class_servDNS.inc:36
-msgid "Add DNS service"
-msgstr "Добавить сервис DNS"
+#: plugins/admin/systems/servkolab.tpl:38
+#, fuzzy
+msgid "IMAP/SSL service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/class_servDNS.inc:37
+#: plugins/admin/systems/servkolab.tpl:46
 #, fuzzy
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
-msgstr ""
-"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
-"ниже."
+msgid "Sieve service"
+msgstr "Служба SSH"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Шаблон рабочей станции"
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Имя рабочий станции"
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:10
+#: plugins/admin/systems/servkolab.tpl:81
 #, fuzzy
-msgid "Kerberos Realm"
-msgstr "Kerberos"
+msgid "Quota settings"
+msgstr "Настройки Samba"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/servkolab.tpl:97
 #, fuzzy
-msgid "Admin user"
-msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
+msgid "Free/Busy settings"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Ñ\84акÑ\81а"
 
-#: plugins/admin/systems/servdb.tpl:26
-#, fuzzy
-msgid "FAX database"
-msgstr "Базы данных"
-
-#: plugins/admin/systems/servdb.tpl:30
-#, fuzzy
-msgid "FAX DB user"
-msgstr "Показать пользователей факсов"
-
-#: plugins/admin/systems/servdb.tpl:42
-#, fuzzy
-msgid "Asterisk management"
-msgstr "Управление системами"
-
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:74
-#, fuzzy
-msgid "Server identifier"
-msgstr "Номер дома"
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-#, fuzzy
-msgid "Connect URL"
-msgstr "Подключение"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:91
-#, fuzzy
-msgid "Sieve port"
-msgstr "Сервер"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:100
-#, fuzzy
-msgid "Logging database"
-msgstr "база пользователя"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:104
-msgid "Logging DB user"
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:112
-#, fuzzy
-msgid "Remove Kolab extension"
-msgstr "Удалить параметры"
+#: plugins/admin/systems/class_servDNS.inc:33
+msgid "Remove DNS service"
+msgstr "Удалить сервис DNS"
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servDNS.inc:34
 #, fuzzy
 msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:115
-#, fuzzy
-msgid "Add Kolab service"
+#: plugins/admin/systems/class_servDNS.inc:36
+msgid "Add DNS service"
 msgstr "Добавить сервис DNS"
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servDNS.inc:37
 #, fuzzy
 msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
 "ниже."
 
-#: plugins/admin/systems/class_servKolab.inc:143
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:149
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:221
-msgid "Future days in Free/Busy settings must be set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:223
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "The given Quota settings value must be a number."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:231
-msgid "Future days must be a value."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "No SMTP privileged networks set."
-msgstr ""
-
-#: plugins/admin/systems/class_servKolab.inc:239
-msgid "No SMTP smarthost/relayhost set."
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:14
+#: plugins/admin/systems/servdb.tpl:10
 #, fuzzy
-msgid "POP3 service"
-msgstr "Служба печати"
+msgid "Kerberos Realm"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #, fuzzy
-msgid "POP3/SSL service"
-msgstr "СлÑ\83жба SSH"
+msgid "Admin user"
+msgstr "Ð\9fолÑ\8cзоваÑ\82ели домена"
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/servdb.tpl:26
 #, fuzzy
-msgid "IMAP service"
-msgstr "LDAP-сервер"
+msgid "FAX database"
+msgstr "Базы данных"
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/servdb.tpl:30
 #, fuzzy
-msgid "IMAP/SSL service"
-msgstr "СлÑ\83жба SSH"
+msgid "FAX DB user"
+msgstr "Ð\9fоказаÑ\82Ñ\8c полÑ\8cзоваÑ\82елей Ñ\84акÑ\81ов"
 
-#: plugins/admin/systems/servkolab.tpl:46
+#: plugins/admin/systems/servdb.tpl:42
 #, fuzzy
-msgid "Sieve service"
-msgstr "СлÑ\83жба SSH"
+msgid "Asterisk management"
+msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:81
-#, fuzzy
-msgid "Quota settings"
-msgstr "Настройки Samba"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/servdb.tpl:74
 #, fuzzy
-msgid "Free/Busy settings"
-msgstr "Настройки факса"
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr ""
+msgid "Server identifier"
+msgstr "Номер дома"
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:78
+#, fuzzy
+msgid "Connect URL"
+msgstr "Подключение"
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:91
+#, fuzzy
+msgid "Sieve port"
+msgstr "Сервер"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:100
+#, fuzzy
+msgid "Logging database"
+msgstr "база пользователя"
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
+#: plugins/admin/systems/servdb.tpl:104
+msgid "Logging DB user"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr ""
+#: plugins/admin/systems/wingeneric.tpl:6
+#, fuzzy
+msgid "Machine name"
+msgstr "Название"
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-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/servkolab.tpl:163
-msgid "Accept Internet Mail"
+#: 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/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-#, fuzzy
-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."
+#: plugins/admin/systems/class_servDB.inc:172
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
 msgstr ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
 
 #: plugins/admin/systems/headpage.tpl:6
 msgid "List of systems"
@@ -5462,16 +5378,204 @@ msgstr "Показать адреса пользователя"
 msgid "User name of which terminal(s) are shown"
 msgstr "Имя пользователя, для которого перечисляются терминалы"
 
-#: plugins/admin/systems/service.tpl:4
-msgid "Keyboard"
-msgstr "Клавиатура"
-
-#: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
-msgid "Model"
-msgstr "Модель"
-
-#: plugins/admin/systems/service.tpl:9
-msgid "Choose keyboard model"
+#: 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 ""
+"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
+"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
+"результаты этой операции."
+
+#: plugins/admin/systems/class_servKolab.inc:112
+#, fuzzy
+msgid "Remove Kolab extension"
+msgstr "Удалить параметры"
+
+#: plugins/admin/systems/class_servKolab.inc:112
+#, fuzzy
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_servKolab.inc:115
+#, fuzzy
+msgid "Add Kolab service"
+msgstr "Добавить сервис DNS"
+
+#: plugins/admin/systems/class_servKolab.inc:115
+#, fuzzy
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
+"ниже."
+
+#: plugins/admin/systems/class_servKolab.inc:143
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:149
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:221
+msgid "Future days in Free/Busy settings must be set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:223
+msgid "Future days in Free/Busy settings must be a positive value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:227
+msgid "The given Quota settings value must be a number."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days must be a value."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "No SMTP privileged networks set."
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:239
+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/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/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during next reboot. Please memorize the new password, because the you "
+"would't be able to log in. <b>Leave fields blank for password inheritance "
+"from default entries.</b>"
+msgstr ""
+"В полях ниже вы можете изменить пароль суперпользователя для выбранного "
+"терминала. Изменения вступят в силу после следующей перезагрузки. "
+"Пожалуйста, запомните новый пароль, так как иначе вы не сможете войти в "
+"систему. <b>Оставьте поля пустыми, если хотите использовать значение по "
+"умолчанию.</b>"
+
+#: plugins/admin/systems/password.tpl:6
+msgid "Changing the password impinges on authentification only."
+msgstr "Изменение пароля влияет только на аутентификацию в системе."
+
+#: plugins/admin/systems/service.tpl:4
+msgid "Keyboard"
+msgstr "Клавиатура"
+
+#: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
+msgid "Model"
+msgstr "Модель"
+
+#: plugins/admin/systems/service.tpl:9
+msgid "Choose keyboard model"
 msgstr "Выберите модель клавиатуры"
 
 #: plugins/admin/systems/service.tpl:15
@@ -5625,23 +5729,6 @@ msgstr "Предоставлять службу сканирования"
 msgid "Select scanner driver to use"
 msgstr "Выберите драйвер для используемого сканера"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during next reboot. Please memorize the new password, because the you "
-"would't be able to log in. <b>Leave fields blank for password inheritance "
-"from default entries.</b>"
-msgstr ""
-"В полях ниже вы можете изменить пароль суперпользователя для выбранного "
-"терминала. Изменения вступят в силу после следующей перезагрузки. "
-"Пожалуйста, запомните новый пароль, так как иначе вы не сможете войти в "
-"систему. <b>Оставьте поля пустыми, если хотите использовать значение по "
-"умолчанию.</b>"
-
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-msgstr "Изменение пароля влияет только на аутентификацию в системе."
-
 #: plugins/admin/systems/class_componentGeneric.inc:113
 #: plugins/admin/systems/class_phoneGeneric.inc:276
 #, fuzzy
@@ -5841,101 +5928,91 @@ msgstr ""
 msgid "You have no permissions to create a phone on this 'Base'."
 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/ogroups/termgroup.tpl:1
+msgid ""
+"All actions you choose here influence <b>all</b> machines in this object "
+"group. Be aware that rebooting machines may not make people happy who are "
+"currently working at these machines."
+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
+#: plugins/admin/ogroups/termgroup.tpl:7
 #, fuzzy
-msgid "Choose a phone type"
-msgstr "Выберите тип мыши"
+msgid "Select action to execute for this   group of terminals"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
 
-#: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
-msgid "refresh"
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/ogroups/mail.tpl:11
 #, fuzzy
-msgid "DTMF mode"
-msgstr "Режим"
+msgid "Primary mail address for this distribution list"
+msgstr "Ð\9eÑ\81новной адÑ\80еÑ\81 Ñ\8dл. поÑ\87Ñ\82Ñ\8b длÑ\8f Ñ\8dÑ\82ой обÑ\89ей папки"
 
-#: 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/ogroups/tabs_ogroups.inc:19
+msgid "Terminals"
+msgstr "Терминалы"
 
-#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/ogroups/tabs_ogroups.inc:37
 #, fuzzy
-msgid "Modus"
-msgstr "Мышь"
-
-#: plugins/admin/systems/phonesettings.tpl:111
-msgid "Authtype"
-msgstr ""
+msgid "Phone queue"
+msgstr "Номер телефона"
 
-#: plugins/admin/systems/phonesettings.tpl:121
+#: plugins/admin/ogroups/headpage.tpl:24
 #, fuzzy
-msgid "Secret"
-msgstr "Улица"
-
-#: plugins/admin/systems/phonesettings.tpl:129
-msgid "GoFonInkeys"
+msgid ""
+"This menu allows you to add, edit or 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/systems/phonesettings.tpl:137
-msgid "GoFonOutKeys"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Показать группы с пользователями"
 
-#: plugins/admin/systems/phonesettings.tpl:150
-#, fuzzy
-msgid "Account code"
-msgstr "Учетная запись"
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Показать группы с группами"
 
-#: plugins/admin/systems/phonesettings.tpl:158
-#, fuzzy
-msgid "Trunk lines"
-msgstr "Тонкие клиенты"
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Показать группы с приложениями"
 
-#: plugins/admin/systems/phonesettings.tpl:173
-msgid "Hosts that are allowed to connect"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Показать группы с подразделениями"
 
-#: plugins/admin/systems/phonesettings.tpl:188
-#, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Показать группы с серверами"
 
-#: plugins/admin/systems/phonesettings.tpl:210
-msgid "MSN"
-msgstr ""
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Показать группы с рабочими станциями"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "ТеÑ\80миналÑ\8b"
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Ð\9fоказаÑ\82Ñ\8c гÑ\80Ñ\83ппÑ\8b Ñ\81 Ñ\82еÑ\80миналами"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:37
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Показать группы с принтерами"
+
+#: plugins/admin/ogroups/headpage.tpl:51
 #, fuzzy
-msgid "Phone queue"
-msgstr "Номер телефона"
+msgid "Display object groups matching"
+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/ogroup_objects.tpl:6
 msgid "Select objects to add"
@@ -6005,81 +6082,8 @@ msgstr "Показать совпадения объектов"
 msgid "Regular expression for matching object names"
 msgstr "Регулярное выражение, соответствующее именам объектов"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-#, fuzzy
-msgid "Select action to execute for this   group of terminals"
-msgstr "Выберите действие, которое нужно выполнить на этом терминале"
-
-#: plugins/admin/ogroups/class_ogroup.inc:95
-msgid "This 'dn' is no object group."
-msgstr "Этот объект не является группой."
-
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "too many different objects!"
-msgstr "слишком много различных объектов!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "users"
-msgstr "пользователи"
-
-#: plugins/admin/ogroups/class_ogroup.inc:206
-msgid "groups"
-msgstr "группы"
-
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "applications"
-msgstr "приложения"
-
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "departments"
-msgstr "подразделения"
-
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "servers"
-msgstr "серверы"
-
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "workstations"
-msgstr "рабочие станции"
-
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "terminals"
-msgstr "терминалы"
-
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "phones"
-msgstr "телефоны"
-
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "printers"
-msgstr "принтеры"
-
-#: plugins/admin/ogroups/class_ogroup.inc:220
-msgid "and"
-msgstr "и"
-
-#: plugins/admin/ogroups/class_ogroup.inc:371
-msgid "Non existing dn: "
-msgstr "Не существующий dn:"
-
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr "В группе должно быть не менее одного участника!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:507
-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
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
 msgid "Object groups"
 msgstr "Объединения"
 
@@ -6129,213 +6133,74 @@ msgstr "Объект группы"
 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
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
-"сможет восстановить эти данные."
-
-#: plugins/admin/ogroups/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit or 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/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Показать группы с пользователями"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Показать группы с группами"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Показать группы с приложениями"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Показать группы с подразделениями"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Показать группы с серверами"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Показать группы с рабочими станциями"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Показать группы с терминалами"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Показать группы с принтерами"
-
-#: plugins/admin/ogroups/headpage.tpl:51
-#, fuzzy
-msgid "Display object groups matching"
-msgstr "Показать совпадения объектов"
-
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
-msgstr ""
-
-#: plugins/admin/ogroups/mail.tpl:11
-#, fuzzy
-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 ""
-"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
-"их, щелкнув ниже."
-
-#: 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/class_phonequeue.inc:83
-#, fuzzy
-msgid "Remove the phone queue from this Account"
-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/class_phonequeue.inc:86
-#, fuzzy
-msgid "Create phone queue"
-msgstr "Создать телефонный аккаунт"
-
-#: 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/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 "Системы"
+#: plugins/admin/ogroups/class_ogroup.inc:95
+msgid "This 'dn' is no object group."
+msgstr "Этот объект не является группой."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:203
+msgid "too many different objects!"
+msgstr "слишком много различных объектов!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:205
+msgid "users"
+msgstr "пользователи"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:206
+msgid "groups"
+msgstr "группы"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:207
+msgid "applications"
+msgstr "приложения"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:208
+msgid "departments"
+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_ogroup.inc:209
+msgid "servers"
+msgstr "серверы"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
-msgid "Timeout must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:210
+msgid "workstations"
+msgstr "рабочие станции"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
-msgid "Retry must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:211
+msgid "terminals"
+msgstr "терминалы"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
-msgid "Max queue length must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:212
+msgid "phones"
+msgstr "телефоны"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
-msgid "Announce frequency must be numeric"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:213
+msgid "printers"
+msgstr "принтеры"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
-msgid "There must be least one queue number defined."
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:220
+msgid "and"
+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_ogroup.inc:371
+msgid "Non existing dn: "
+msgstr "Не существующий dn:"
 
-#: 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_ogroup.inc:502
+msgid "Object groups need at least one member!"
+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_ogroup.inc:507
+msgid "You can combine two different object types at maximum only!"
+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'."
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
 msgstr ""
+"Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
+"сможет восстановить эти данные."
 
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
@@ -6465,190 +6330,240 @@ msgstr ""
 msgid "Hold sound file"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Настройки телефона"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
-#, fuzzy
-msgid "no macro"
-msgstr "Телефонные отчеты"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:121
+#: plugins/admin/ogroups/class_mailogroup.inc:38
 #, fuzzy
-msgid "undefined"
-msgstr "не определена"
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:468
-msgid "Error while performing query "
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
+"В этой учетной записи есть настройки электронной почты. Вы можете удалить "
+"их, щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:512
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+#, fuzzy
 msgid ""
-"The macro you selected in the past, is no longer available for you, please "
-"choose another one."
+"This group has mail features disabled. You can enable them by clicking below."
 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"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "Remove the phone queue from this Account"
 msgstr "Удалить телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+#, fuzzy
 msgid ""
-"This account has phone features enabled. You can disable them by clicking "
-"below."
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
 "В этой учетной записи включены телефонные атрибуты. Вы можете отключить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:624
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:627
-msgid "Create phone account"
+#: plugins/admin/ogroups/class_phonequeue.inc:86
+#, fuzzy
+msgid "Create phone queue"
 msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:625
+#: plugins/admin/ogroups/class_phonequeue.inc:86
 #, fuzzy
 msgid ""
-"This account has phone features disabled. You can't enable them while no uid "
-"is set."
+"For this group the phone queues are disabled. You can enable them by "
+"clicking below."
 msgstr ""
 "В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
 "щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:628
-msgid ""
-"This account has phone features disabled. You can enable them by clicking "
-"below."
+#: plugins/admin/ogroups/class_phonequeue.inc:134
+msgid "Uruguai"
 msgstr ""
-"В этой учетной записи отключены телефонные атрибуты. Вы можете включить их, "
-"щелкнув ниже."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
-msgid "Please enter a valid phone number!"
-msgstr "Введите корректный номер телефона!"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+msgid "No"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:679
-msgid "Choose your private phone"
-msgstr "Укажите личный телефон"
+#: plugins/admin/ogroups/class_phonequeue.inc:135
+#, fuzzy
+msgid "Yes"
+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:136
+msgid "ring all available channels until one answers"
+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:137
+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."
+#: plugins/admin/ogroups/class_phonequeue.inc:138
+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"
+#: plugins/admin/ogroups/class_phonequeue.inc:139
+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 "Неправильный номер телефона '%s'"
+#: plugins/admin/ogroups/class_phonequeue.inc:140
+msgid "ring random interface"
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
+#: 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/macro/class_gofonMacro.inc:181
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
 #, php-format
-msgid "The timeout '%s' contains invalid characters!"
-msgstr "Неправильное указание таймаута '%s'"
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:855
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/admin/ogroups/class_phonequeue.inc:223
+#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
 #, fuzzy, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr "Ð\9dепÑ\80авилÑ\8cное Ñ\83казание Ñ\82аймаÑ\83Ñ\82а '%s'"
+msgid "Can't select database %s on %s."
+msgstr "Ð\9dевозможно вÑ\8bбÑ\80аÑ\82Ñ\8c базÑ\83 даннÑ\8bÑ\85!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
-msgid "Stop"
-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/gofon/phoneaccount/class_phoneAccount.inc:1045
+#: 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 "Removed user '%s' from phone queue '%s'."
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "ТелеÑ\84оннÑ\8bе номеÑ\80а"
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "СпиÑ\81ок гÑ\80Ñ\83пп"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
-msgid "Forward calls to"
-msgstr "Перенаправлять звонки на"
+#: 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 ""
+"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
+"группы пользователей. Если у вас их достаточно большое количество, вы можете "
+"использовать групповое выделение."
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Phone number"
-msgstr "Ð\9dомеÑ\80 Ñ\82елеÑ\84она"
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
-msgid "Timeout (s)"
-msgstr "Таймаут (с)"
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Шаблон для групп"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Phone macro"
-msgstr "ТелеÑ\84оннÑ\8bе оÑ\82Ñ\87еÑ\82Ñ\8b"
+msgid "Regular expression for matching macro names"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам гÑ\80Ñ\83пп"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
-msgid "fill out"
-msgstr "Выход"
+msgid "Macro name"
+msgstr "Название"
+
+#: 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 "Выберите ветку для группы"
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Список пользователей"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/macro/generic.tpl:52
 #, fuzzy
-msgid "Phone PIN"
-msgstr "ТелеÑ\84он"
+msgid "Macro text"
+msgstr "Ð\9dазвание"
 
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
 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:248
+#, fuzzy, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-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:154
-msgid "Query for phone database failed!"
-msgstr "Запрос в базу телефонов не выполнен!"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Создать телефонный аккаунт"
 
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Источник"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#, fuzzy
+msgid "Visible"
+msgstr "Переменная"
 
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-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:33
-msgid "Channel"
-msgstr "Канал"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#, fuzzy
+msgid "Macro"
+msgstr "Название"
 
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Продолжительность"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#, fuzzy
+msgid "visible"
+msgstr "Видимый всем"
 
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Телефонные отчеты"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#, fuzzy
+msgid "invisible"
+msgstr "Видимый всем"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:91
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -6710,155 +6625,240 @@ msgstr ""
 msgid "Please choose a valid  base."
 msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
-msgid "Macro name"
-msgstr "Название"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr ""
+msgid "Argument"
+msgstr "подразделения"
 
-#: plugins/gofon/macro/generic.tpl:22
+#: plugins/gofon/macro/parameter.tpl:7
 #, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Ð\92Ñ\8bбеÑ\80иÑ\82е веÑ\82кÑ\83 длÑ\8f гÑ\80Ñ\83ппÑ\8b"
+msgid "type"
+msgstr "Тип"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 #, fuzzy
-msgid "Visible for user"
-msgstr "СпиÑ\81ок полÑ\8cзоваÑ\82елей"
+msgid "String"
+msgstr "в Ñ\82еÑ\87ение"
 
-#: plugins/gofon/macro/generic.tpl:52
-#, fuzzy
-msgid "Macro text"
-msgstr "Название"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+msgid "Combobox"
+msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:6
-#, fuzzy
-msgid "List of macros"
-msgstr "Список групп"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+msgid "Bool"
+msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:24
+#: 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:855
+#, 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 ""
-"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."
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
 msgstr ""
-"С помощью этого меню вы можете добавлять, изменять и удалять выбранные "
-"группы пользователей. Если у вас их достаточно большое количество, вы можете "
-"использовать групповое выделение."
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 #, fuzzy
-msgid "Display macros matching"
-msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
+msgid "Phone macro management"
+msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: 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
 #, fuzzy
-msgid "Display macros  matching"
-msgstr "Шаблон длÑ\8f гÑ\80Ñ\83пп"
+msgid "Phone macro"
+msgstr "ТелеÑ\84оннÑ\8bе оÑ\82Ñ\87еÑ\82Ñ\8b"
 
-#: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение, Ñ\81ооÑ\82веÑ\82Ñ\81Ñ\82вÑ\83Ñ\8eÑ\89ее именам гÑ\80Ñ\83пп"
+msgid "fill out"
+msgstr "Ð\92Ñ\8bÑ\85од"
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/phoneaccount/generic.tpl:78
 #, fuzzy
-msgid "Phone macro management"
-msgstr "УпÑ\80авление Ñ\81иÑ\81Ñ\82емами"
+msgid "Phone PIN"
+msgstr "ТелеÑ\84он"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
-msgid "String"
-msgstr "в Ñ\82еÑ\87ение"
+msgid "no macro"
+msgstr "ТелеÑ\84оннÑ\8bе оÑ\82Ñ\87еÑ\82Ñ\8b"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
-msgid "Combobox"
+#: 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 ""
+"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/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
+#, fuzzy
+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 "You need to specify at least one phone number!"
+msgstr "Необходимо указать не менее одного телефонного номера!"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:824
+#, fuzzy, php-format
+msgid "You need to specify a Phone PIN."
+msgstr "Необходимо указать не менее одного телефонного номера!"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
-msgid "Bool"
+#: 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/macro/class_gofonMacroParameters.inc:247
-#, fuzzy
-msgid "Delete unused"
-msgstr "Удалить"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:829
 #, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgid "The given PIN is too short"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:844
 #, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr ""
+msgid "The number '%s' is no valid phone number!"
+msgstr "Неправильный номер телефона '%s'"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:847
 #, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
+msgid "The timeout '%s' contains invalid characters!"
+msgstr "Неправильное указание таймаута '%s'"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1010
+msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-#, fuzzy
-msgid "Phone macros"
-msgstr "Телефонные отчеты"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1045
+#, php-format
+msgid "Removed user '%s' from phone queue '%s'."
+msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, fuzzy, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Вы собираетесь удалить группу \"%s\"."
+#: plugins/gofon/phoneaccount/main.inc:120
+msgid "Phone settings"
+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/main.inc:5
+msgid "Phone reports"
+msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Создать телефонный аккаунт"
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Телефонные отчеты"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-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:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr "Не могу выбрать базу телефонов для создания отчета!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Название"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "Запрос в базу телефонов не выполнен!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Видимый всем"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Источник"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Видимый всем"
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Назначение"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "подразделения"
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Канал"
 
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Тип"
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Продолжительность"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -6905,11 +6905,36 @@ msgstr "Команда разработчиков GOsa"
 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 ""
+
 #: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 
-#: include/php_setup.inc:71 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:313
 #, fuzzy
 msgid "Toggle information"
 msgstr "Личная информация"
@@ -7114,174 +7139,78 @@ msgstr "Невозможно зарегистрироваться на серв
 #: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
-msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
-
-#: include/class_mail-methods-cyrus.inc:307
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
-
-#: include/class_mail-methods-cyrus.inc:311
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%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 ""
-"Ваш конфигурационный файл gosa.conf был частично изменен. Пожалуйста, "
-"сконвертиуйте его используя скрипт 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 ""
-"Вы сейчас редактируете объект базы данных. Хотите отказаться от изменений?"
-
-#: 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 ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
-
-#: 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_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/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 ""
-"Автоматическое создание типа \"%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 ""
+msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:684
+#: include/class_mail-methods-cyrus.inc:307
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr ""
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:700
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
 
-#: include/class_certificate.inc:35
-msgid "Can't open specified file, check accessibility and or existence"
+#: 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 ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_certificate.inc:53
-msgid "Can't read specified certificate / or empty string given"
+#: 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_certificate.inc:80
-msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+#: 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_certificate.inc:95
-msgid "The Format must be PEM, to output certificate informations"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 
-#: include/class_certificate.inc:192
-#, fuzzy
-msgid "Can't create/open File"
-msgstr "Ð\9dевозможно импоÑ\80Ñ\82иоваÑ\82Ñ\8c пÑ\83Ñ\81Ñ\82ой Ñ\84айл"
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr "Ð\9eÑ\88ибка пÑ\80и Ñ\83Ñ\81Ñ\82ановке паÑ\80олÑ\8f. Ð\9eÑ\82веÑ\82 LDAP-Ñ\81еÑ\80веÑ\80а: \"%s\"."
 
-#: include/class_certificate.inc:199
-msgid "No valid certificate loaded"
+#: 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/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %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 ""
+"Ваш конфигурационный файл gosa.conf был частично изменен. Пожалуйста, "
+"сконвертиуйте его используя скрипт fix_config.sh"
 
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
+#: 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/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -7723,6 +7652,77 @@ 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
+msgid ""
+"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 ""
+
 #: html/helpviewer.php:54
 msgid "Help is not available if you are not logged in."
 msgstr ""
@@ -7742,6 +7742,12 @@ msgid ""
 "Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr ""
+"Ошибка: для экспорта в формат vcard файлу getcvard.php нужно передать "
+"параметр!"
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "Невозможно подключиться к серверу базы данных!"
@@ -7754,12 +7760,6 @@ msgstr "Невозможно выбрать базу данных!"
 msgid "Database query failed!"
 msgstr "Невозможно выполнить запрос к базе данных!"
 
-#: html/getvcard.php:36
-msgid "Error: getcvard.php needs a parameter to export a vcard!"
-msgstr ""
-"Ошибка: для экспорта в формат vcard файлу getcvard.php нужно передать "
-"параметр!"
-
 #: html/setup.php:86
 #, fuzzy, php-format
 msgid ""
@@ -7767,7 +7767,7 @@ msgid ""
 "check existence and rigths of this directory!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/main.php:96
+#: html/main.php:112
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -7775,16 +7775,16 @@ msgstr ""
 "Используется механизм register_globals. GOsa не допустит пользователей в "
 "систему, пока он не будет отключен администратором."
 
-#: html/main.php:139
+#: html/main.php:155
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr "Предупреждение: нехватка памяти, увеличьте значение memory_limit!"
 
-#: html/main.php:263
+#: html/main.php:284
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "Не удается найти определение для модуля \"%s\"!"
 
-#: html/main.php:292
+#: html/main.php:313
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
@@ -7862,6 +7862,25 @@ 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 ""
+"Чтобы войти в систему<br> введите свои <i>имя пользователя</i> и <i>пароль</"
+"i>."
+
+#: 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 "Каталог"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Войти"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Нажмите на эту кнопку, чтобы войти в систему"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Конфликт сеансов"
@@ -7891,25 +7910,6 @@ msgstr ""
 msgid "Logout"
 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 ""
-"Чтобы войти в систему<br> введите свои <i>имя пользователя</i> и <i>пароль</"
-"i>."
-
-#: 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 "Каталог"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Войти"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Нажмите на эту кнопку, чтобы войти в систему"
-
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -7931,6 +7931,20 @@ msgstr ""
 "затем - установлены ли дополнительные/необходимые программы, а потом вы "
 "укажете параметры работы с 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/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -7951,24 +7965,6 @@ msgstr "Выход"
 msgid "Signed in:"
 msgstr "Пользователь:"
 
-#: 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 "Продолжение настройки..."
-
-#: 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 ""
-"На втором шаге происходит поиск вспомогательных программ и проверка "
-"допустимости их версии."
-
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Конфликт блокировок"
@@ -7983,19 +7979,23 @@ 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_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 "Продолжение настройки..."
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 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."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
+"На втором шаге происходит поиск вспомогательных программ и проверка "
+"допустимости их версии."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4