Code

Added Translation Strings.
authorjanw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 12 Aug 2005 14:41:03 +0000 (14:41 +0000)
committerjanw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 12 Aug 2005 14:41:03 +0000 (14:41 +0000)
Added German Translation.

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

locale/de/LC_MESSAGES/messages.mo
locale/de/LC_MESSAGES/messages.po
locale/es/LC_MESSAGES/messages.po
locale/fr/LC_MESSAGES/messages.po
locale/it/LC_MESSAGES/messages.po
locale/messages.po
locale/nl/LC_MESSAGES/messages.po
locale/ru/LC_MESSAGES/messages.po

index b5c4589ac023a65a7b149d1baf1ba0579893b9cf..7339f417d1377a941d8883c258548aa9af3128ee 100644 (file)
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ
index f17a0d75e2169bbe3e7fe49b45175ad90f06e857..60df9e5a03a8eb99ced2f7546daf191c46e3f4e5 100644 (file)
@@ -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-12 16:56+0200\n"
+"PO-Revision-Date: 2005-08-12 17:06+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:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: 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:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -75,7 +75,7 @@ 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:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
@@ -88,7 +88,7 @@ msgstr "Fax"
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -117,7 +117,7 @@ msgstr "Anwendungen"
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr "Optionen"
 
@@ -281,7 +281,7 @@ msgstr "Benutzername, dessen Adressen angezeigt werden"
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -308,10 +308,10 @@ msgstr "Hinzuf
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -389,7 +389,7 @@ msgstr "Liste alternativer Mail-Adressen"
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr "Entfernen"
@@ -486,7 +486,7 @@ msgstr "schaltet alle 
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -680,7 +680,7 @@ msgstr "Es wurde kein Ordner f
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -780,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:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -789,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:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben ist leer."
@@ -1595,7 +1595,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
@@ -1605,7 +1605,7 @@ 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
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
@@ -1802,7 +1802,7 @@ 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:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2417,7 +2417,7 @@ msgstr "Bitte geben Sie eine g
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2428,19 +2428,19 @@ 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:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr "Auf"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2451,7 +2451,7 @@ 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:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2462,7 +2462,7 @@ msgstr "Wurzel"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2472,7 +2472,7 @@ 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:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2491,7 +2491,7 @@ msgstr "Neue Sperrlisten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2502,7 +2502,7 @@ msgstr "Momentane Basis"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2513,7 +2513,7 @@ msgstr "Aktualisieren"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2524,7 +2524,7 @@ msgstr "
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2534,14 +2534,14 @@ msgid "edit"
 msgstr "Bearbeiten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: 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:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2551,7 +2551,7 @@ msgid "delete"
 msgstr "Entfernen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr "Benutzer entfernen"
@@ -2563,7 +2563,7 @@ 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:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2647,7 +2647,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "FAX-Nummer auf die GOfax reagieren soll"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr "Sprache"
 
@@ -3549,7 +3549,7 @@ msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 msgid "Posix"
 msgstr "Posix"
 
@@ -3566,7 +3566,7 @@ msgid "Groupname"
 msgstr "Name der Gruppe"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3913,52 +3913,52 @@ msgstr ""
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 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
+#: plugins/admin/users/class_userManagement.inc:350
 #, 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
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 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:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 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:651
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "Create new user"
 msgstr "Neuen Benutzer erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New user"
 msgstr "Neuer Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "Create new template"
 msgstr "Neue Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr "Neue Vorlage"
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "password"
 msgstr "Passwort"
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -3967,55 +3967,55 @@ msgstr "Passwort"
 msgid "Username"
 msgstr "Benutzername"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 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:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 msgid "Edit UNIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 msgid "Edit fax properies"
 msgstr "Fax-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 msgid "Create user from template"
 msgstr "Neuen Benutzer aus Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Online"
 msgstr "aktiv"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Offline"
 msgstr "inaktiv"
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -4066,11 +4066,10 @@ msgstr ""
 "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
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr "Regulärer Ausdruck zum Abgleich mit Anwendungsnamen"
 
@@ -5411,7 +5410,6 @@ msgid "Choose a phone type"
 msgstr "Wählen Sie den Telefon-Typ"
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "refresh"
 msgstr "Aktualisieren"
 
@@ -6122,118 +6120,116 @@ msgstr ""
 msgid "Queue Settings"
 msgstr "Warteschlangen-Einstellungen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr "Allgemeine Einstellungen"
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Telefonnummern"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 msgid "Generic queue Settings"
 msgstr "Allgemeine Warteschlangen-Einstellungen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-msgid "Phone Number"
-msgstr "Telefonnummer"
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr "Ab"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 msgid "Timeout"
 msgstr "Wartezeit"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 msgid "Strategy"
 msgstr "Strategie"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr "Maximale Grösse der Warteschlange"
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr "Benachrichtigungsfrequenz"
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr "(in Sekunden)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr "Benachrichtige über Wartezeit"
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr "Erlaube Weiterleiten des Gesprächs (Angerufener)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr "Erlaube Weiterleiten des Gesprächs (Anrufer)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr "Auflegen durch Drücken der Taste '*' (Angerufener)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr "Auflegen durch Drücken der Taste '*' (Anrufer)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr "Klingelton statt Hintergrund-Musik"
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr "Einstellung der Ansagen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr "Benutze Wartemusik statt Klingelton"
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr "Wartemusik"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 msgid "Welcome sound file"
 msgstr "'Willkommen'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 msgid "Announce message"
 msgstr "Benachrichtigung"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr "'Sie sind der Nächste...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr "'Es gibt ...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr "'... wartende Anrufe'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 msgid "'Thank you' message"
 msgstr "'Vielen Dank'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr "'Minuten'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr "'Sekunden'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr "Gespräch halten"
 
@@ -6259,8 +6255,8 @@ msgstr "Warteschlange von diesem Konto entfernen"
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
-"Diese Gruppe hat die Warteschlangen-Erweiterung aktiviert. Sie können "
-"diese durch einen Klick auf die untere Schaltfläche deaktivieren."
+"Diese Gruppe hat die Warteschlangen-Erweiterung aktiviert. Sie können diese "
+"durch einen Klick auf die untere Schaltfläche deaktivieren."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:86
 msgid "Create phone queue"
@@ -6271,8 +6267,8 @@ msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
-"Diese Gruppe hat keine gültigen Warteschlangen-Erweiterung. Sie können "
-"diese durch einen Klick auf die untere Schaltfläche aktivieren."
+"Diese Gruppe hat keine gültigen Warteschlangen-Erweiterung. Sie können diese "
+"durch einen Klick auf die untere Schaltfläche aktivieren."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:134
 msgid "Uruguai"
@@ -6287,51 +6283,51 @@ msgid "Yes"
 msgstr "Ja"
 
 #: 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"
+msgid "ring all"
+msgstr "rufe alle"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
-msgstr "Rufe auf alle verfügbaren Anschlüsse"
+msgid "round robin"
+msgstr "nacheinander"
 
 #: 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"
+msgid "least recently called"
+msgstr "am wenigsten Anrufe"
 
 #: 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"
+msgid "fewest completed calls"
+msgstr "am wenigsten abgeschlossene Anrufe"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr "Rufe auf zufälligen Anschluss"
+msgid "random"
+msgstr "zufällig"
 
 #: 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"
+msgid "round robin with memory"
+msgstr "nacheinander (mit Speicher)"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 msgid "Timeout must be numeric"
 msgstr "Der Wert für 'Wartezeit' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr "Der Wert für 'Wiederholen' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr "Der Wert für 'Maximale Grösse der Warteschlange' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 msgid "Announce frequency must be numeric"
 msgstr "Der Wert für 'Benachrichtigungsfrequenz' muss numerisch sein"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 msgid "There must be least one queue number defined."
 msgstr "Es ist mindestens eine Telefonnummer erforderlich."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:213
-#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6343,8 +6339,8 @@ 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:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6352,15 +6348,15 @@ msgstr ""
 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:250
-#: plugins/admin/ogroups/class_phonequeue.inc:446
-#: plugins/admin/ogroups/class_phonequeue.inc:594
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, 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:475
 #: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6573,36 +6569,35 @@ msgstr ""
 msgid "Phone macro management"
 msgstr "Telefon-Makro-Verwaltung"
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Telefonnummern"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
+msgstr "Telefon PIN"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr "Anrufe weiterleiten an"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr "Zeitlimit (s)"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "Phone macro"
 msgstr "Telefon-Makro"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "fill out"
-msgstr "ausfüllen"
+#: plugins/gofon/phoneaccount/generic.tpl:73
+msgid "Refresh"
+msgstr "Aktualisieren"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
-msgstr "Telefon PIN"
+#: plugins/gofon/phoneaccount/generic.tpl:74
+msgid "Complete"
+msgstr "Abschliessen"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 msgid "no macro"
@@ -8193,6 +8188,33 @@ msgstr ""
 "Versionen). In einigen Fällen ist es hilfreich, das 'error_reporting' zu "
 "aktivieren (dies kann jedoch ein Sicherheitsrisiko darstellen)."
 
+#~ msgid "Generic queue setup"
+#~ msgstr "Allgemeine Einstellungen"
+
+#~ msgid "Phone Number"
+#~ msgstr "Telefonnummer"
+
+#~ msgid "ring all available channels until one answers"
+#~ msgstr "Rufe auf alle verfÃŒgbaren AnschlÃŒsse bis jemand antwortet"
+
+#~ msgid "take turns ringing each available interface"
+#~ msgstr "Rufe auf alle verfÃŒgbaren AnschlÃŒsse"
+
+#~ msgid "ring interface which was least recently called by this queue"
+#~ msgstr "Rufe Anschluss, der die wenigsten Anrufe hatte"
+
+#~ msgid "ring the one with fewest completed calls from this queue"
+#~ msgstr "Rufe auf Anschluss mit den wenigsten abgeschlossenen GesprÀchen"
+
+#~ msgid "ring random interface"
+#~ msgstr "Rufe auf zufÀlligen Anschluss"
+
+#~ msgid "round robin with memory, remember where we left off last ring pass"
+#~ msgstr "Ring mit Speicher, an welchem Anschluss der Ring verlassen wurde"
+
+#~ msgid "fill out"
+#~ msgstr "ausfÃŒllen"
+
 #~ msgid "Display lists containing"
 #~ msgstr "Zeige Listen die folgendes enthalten"
 
index daa70fe108b0a605db13010c47f4ffeb864fa1ef..88b41feb4849119f0321a65ce2f6f9c7505c1680 100644 (file)
@@ -48,7 +48,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -57,7 +57,7 @@ msgstr "Correo Electrónico"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -72,7 +72,7 @@ msgstr "Conectividad"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
@@ -85,7 +85,7 @@ msgstr "Fax"
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -114,7 +114,7 @@ msgstr "Aplicaciones"
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr "Opciones"
 
@@ -279,7 +279,7 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -306,10 +306,10 @@ msgstr "Añadir"
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -387,7 +387,7 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr "Borrar"
@@ -485,7 +485,7 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -675,7 +675,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -773,7 +773,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -782,7 +782,7 @@ msgstr ""
 "contraseña' no concuerdan."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -1582,7 +1582,7 @@ msgstr "No tiene permisos para transladar a un usuario de su base original"
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
@@ -1592,7 +1592,7 @@ msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
 #: plugins/personal/generic/class_user.inc:902
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
@@ -1791,7 +1791,7 @@ msgstr "Organización"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2409,7 +2409,7 @@ msgstr "Por favor especifique un usuario valido."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2421,19 +2421,19 @@ msgstr "Nombre del departamento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2445,7 +2445,7 @@ msgstr "Lista de Departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2457,7 +2457,7 @@ msgstr "Reiniciar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2468,7 +2468,7 @@ msgstr "Seleccione para ver los departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2490,7 +2490,7 @@ msgstr "Listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2502,7 +2502,7 @@ msgstr "Contraseña actual"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2514,7 +2514,7 @@ msgstr "Mostrar departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2525,7 +2525,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2536,7 +2536,7 @@ msgid "edit"
 msgstr "Editar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2544,7 +2544,7 @@ msgstr "Usuario administrador"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2555,7 +2555,7 @@ msgid "delete"
 msgstr "Borrar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2569,7 +2569,7 @@ msgstr "Gestión de listas de bloqueo"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2650,7 +2650,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax que activa GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr "Lenguaje"
 
@@ -3553,7 +3553,7 @@ msgid "Delete this entry"
 msgstr "Borrar"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -3572,7 +3572,7 @@ msgid "Groupname"
 msgstr "Nombre del grupo"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3917,55 +3917,55 @@ msgstr ""
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 msgid "You are not allowed to set this users password!"
 msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
 
-#: plugins/admin/users/class_userManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:350
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:355
-#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -3974,65 +3974,65 @@ msgstr "Contraseña"
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Online"
 msgstr "en linea"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -4083,11 +4083,10 @@ msgstr ""
 "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
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 
@@ -5445,7 +5444,6 @@ 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 ""
 
@@ -6170,126 +6168,123 @@ msgstr ""
 msgid "Queue Settings"
 msgstr "Parámetros de quotas"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr ""
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Números de teléfonos"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 #, fuzzy
 msgid "Generic queue Settings"
 msgstr "Información genérica del usuario"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-#, fuzzy
-msgid "Phone Number"
-msgstr "Número de teléfono"
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 #, fuzzy
 msgid "Timeout"
 msgstr "Tiempo(s) excedido(s)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Reintentar"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 #, fuzzy
 msgid "Strategy"
 msgstr "Estado"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "¡Bienvenido %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 #, fuzzy
 msgid "Announce message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 #, fuzzy
 msgid "'Thank you' message"
 msgstr "Estado del mensaje"
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr ""
 
@@ -6350,52 +6345,54 @@ msgid "Yes"
 msgstr "Sistemas"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#, fuzzy
+msgid "ring all"
+msgstr "Terminales"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
+msgid "round robin"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
+msgid "least recently called"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
+msgid "fewest completed calls"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#, fuzzy
+msgid "random"
+msgstr "y"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "round robin with memory, remember where we left off last ring pass"
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 #, fuzzy
 msgid "Timeout must be numeric"
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 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/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6405,8 +6402,8 @@ msgid ""
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6414,15 +6411,15 @@ msgstr ""
 msgid "Can't select database %s on %s."
 msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:446
-#: plugins/admin/ogroups/class_phonequeue.inc:594
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, fuzzy, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:475
 #: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6645,39 +6642,39 @@ msgstr ""
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
-#: 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:33
+#, fuzzy
+msgid "Phone PIN"
+msgstr "Teléfono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr "Reenviar llamadas a"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr "Tiempo(s) excedido(s)"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 #, fuzzy
 msgid "Phone macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:73
 #, fuzzy
-msgid "fill out"
-msgstr "Salir"
+msgid "Refresh"
+msgstr "Referencias"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/phoneaccount/generic.tpl:74
 #, fuzzy
-msgid "Phone PIN"
-msgstr "Teléfono"
+msgid "Complete"
+msgstr "incompleto"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
@@ -8257,6 +8254,14 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "Phone Number"
+#~ msgstr "Número de teléfono"
+
+#, fuzzy
+#~ msgid "fill out"
+#~ msgstr "Salir"
+
 #~ msgid "Display lists containing"
 #~ msgstr "Mostrar listas que contengan"
 
@@ -8374,10 +8379,6 @@ msgstr ""
 #~ msgid "Deliver missed calls as mail"
 #~ msgstr "Enviar llamadas perdidas como correo electrónico"
 
-#, fuzzy
-#~ msgid "Refresh"
-#~ msgstr "Referencias"
-
 #, fuzzy
 #~ msgid "Number"
 #~ msgstr "Noviembre"
index f02e86d8334e4ec39c3c25273063c222d8b9a198..e3b298dfa4ffcf72f292c61c78fa6806695b48b0 100644 (file)
@@ -68,7 +68,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -77,7 +77,7 @@ msgstr "Mail"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -92,7 +92,7 @@ msgstr "Connectivit
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
@@ -105,7 +105,7 @@ msgstr "Fax"
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -134,7 +134,7 @@ msgstr "Applications"
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr "Options"
 
@@ -298,7 +298,7 @@ msgstr "Utilisateur dont on montre les adresses"
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -325,10 +325,10 @@ msgstr "Ajouter"
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -406,7 +406,7 @@ msgstr "Liste des adresses de messagerie alternatives"
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr "Supprimer"
@@ -508,7 +508,7 @@ msgstr "d
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -702,7 +702,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
@@ -802,7 +802,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -811,7 +811,7 @@ msgstr ""
 "'Repeated new password' ne concordent pas."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Le mot de passe que vous avez entré comme 'New password' est vide."
 
@@ -1622,7 +1622,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Name' n'est pas rempli."
 
@@ -1632,7 +1632,7 @@ msgstr "Une personne ayant ce 'Login' existe d
 
 #: plugins/personal/generic/class_user.inc:902
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr "Le champ obligatoire 'Given name' n'est pas rempli."
 
@@ -1827,7 +1827,7 @@ msgstr "Entreprise"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2445,7 +2445,7 @@ msgstr "Veuillez entrer un num
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2456,19 +2456,19 @@ msgstr "Monter d'un d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr "Au dessus"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2479,7 +2479,7 @@ msgstr "Aller au d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2490,7 +2490,7 @@ msgstr "Racine"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2501,7 +2501,7 @@ msgstr "Aller au d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2520,7 +2520,7 @@ msgstr "Nouvelle liste rouge"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2531,7 +2531,7 @@ msgstr "Base actuelle"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2542,7 +2542,7 @@ msgstr "Soumettre le d
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2553,7 +2553,7 @@ msgstr "Soumettre"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2563,14 +2563,14 @@ msgid "edit"
 msgstr "editer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr "Editer un utilisateur"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2580,7 +2580,7 @@ msgid "delete"
 msgstr "supprimer"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr "Supprimer un utilisateur"
@@ -2592,7 +2592,7 @@ msgstr "Nom de la liste rouge"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2676,7 +2676,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Numéro de fax pour lesquels GOfax s'activera"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr "Langue"
 
@@ -3590,7 +3590,7 @@ msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 msgid "Posix"
 msgstr "Posix"
 
@@ -3607,7 +3607,7 @@ msgid "Groupname"
 msgstr "Nom du groupe"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3954,52 +3954,52 @@ msgstr ""
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 msgid "You are not allowed to set this users password!"
 msgstr ""
 "Vous n'êtes pas autorisé à indiquer un mot de passe pour cet utilisateur!"
 
-#: plugins/admin/users/class_userManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:350
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Vous êtes sur le point de supprimer l'utilisateur %s."
 
-#: plugins/admin/users/class_userManagement.inc:355
-#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 msgid "You are not allowed to delete this user!"
 msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
 
-#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Une personne ayant ce nom existe déjà dans l'annuaire."
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "Create new user"
 msgstr "Création d'un nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New user"
 msgstr "Nouvel utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "Create new template"
 msgstr "Créer un nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr "Nouveau modèle"
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -4008,55 +4008,55 @@ msgstr "mot de passe"
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "This table displays all users, in the selected tree."
 msgstr "Ce tableau montre toutes les utilisateurs, dans l'arbre sélectionné."
 
-#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr "GOsa"
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 msgid "Edit UNIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 msgid "Edit fax properies"
 msgstr "Modifier les propriétés fax"
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 msgid "Edit samba properties"
 msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 msgid "Create user from template"
 msgstr "Créer un nouvel utilisateur depuis un modèle"
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Create user with this template"
 msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Online"
 msgstr "en ligne"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Offline"
 msgstr "hors-ligne"
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -4107,11 +4107,10 @@ msgstr ""
 "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
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr "Expression régulière pour faire correspondre le nom des applications"
 
@@ -5458,7 +5457,6 @@ msgid "Choose a phone type"
 msgstr "Sélectionnez un type de téléphone"
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "refresh"
 msgstr "Rafraichir"
 
@@ -6165,118 +6163,116 @@ msgstr ""
 msgid "Queue Settings"
 msgstr "Préférences des queues"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr "Paramètres de base des queues"
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Numéros de téléphones"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 msgid "Generic queue Settings"
 msgstr "Paramètres par défaut des queues"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-msgid "Phone Number"
-msgstr "Numéro de téléphone"
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr "En bas"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 msgid "Timeout"
 msgstr "Temps d'attente"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Réessayer"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 msgid "Strategy"
 msgstr "Stratégie"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr "Taille maximale de la queue"
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr "Fréquence du message d'annonce"
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr "(en secondes)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr "Permettre à l'utilisateur appelé de transférer son appel"
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr "Permettre à l'utilisateur qui appelle de transférer son appel"
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr "Permettre à la personne qui appelle de raccrocher en appuyant sur *"
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr "Sonner au lieu de mettre un musique d'ambiance"
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr "Mettre de la musique lorsqu'on est en attente plutôt que la sonnerie"
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr "Musique d'attente"
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 msgid "Welcome sound file"
 msgstr "Fichier son de bienvenue"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 msgid "Announce message"
 msgstr "Message de présentation"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr "Fichier son pour 'Vous êtes le suivant ...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr "'Il y a ...'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr "'... appels en attente'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 msgid "'Thank you' message"
 msgstr "Message 'Merci'"
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr "Fichier son du message d'attente"
 
@@ -6331,56 +6327,53 @@ msgstr "Oui"
 
 #: 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"
+msgid "ring all"
+msgstr "Terminal"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-#, fuzzy
-msgid "take turns ringing each available interface"
-msgstr "faire sonner les interfaces disponibles tour à tour"
+msgid "round robin"
+msgstr ""
 
 #: 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"
+msgid "least recently called"
+msgstr ""
 
 #: 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"
+msgid "fewest completed calls"
+msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr "Faire sonner un interface de manière aléatoire"
+#, fuzzy
+msgid "random"
+msgstr "et"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "round robin with memory, remember where we left off last ring pass"
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 msgid "Timeout must be numeric"
 msgstr "Le délai d'attente doit être un chiffre"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr "Le délai de rappel automatique doit être un chiffre"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr "La taille maximale de la queue doit être numérique"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 #, fuzzy
 msgid "Announce frequency must be numeric"
 msgstr "La fréquence du message d'annonce doit être numérique"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 msgid "There must be least one queue number defined."
 msgstr "Il doit y avoir au moins un numéro de queue définie."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:213
-#: plugins/admin/ogroups/class_phonequeue.inc:549
+#: plugins/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6392,8 +6385,8 @@ msgstr ""
 "Le serveur MySQL '%s' n'est pas joignable avec l'utilisateur '%s', veuillez "
 "vérifier les logs GOsa pour les erreurs mysql."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6401,16 +6394,16 @@ msgstr ""
 msgid "Can't select database %s on %s."
 msgstr "Impossible de sélectionner la base de données %s située sur %s."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:446
-#: plugins/admin/ogroups/class_phonequeue.inc:594
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 "Impossible d'éffacer dans la base de données %s située sur le serveur %s."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:475
 #: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6623,36 +6616,37 @@ msgstr ""
 msgid "Phone macro management"
 msgstr "Administration des macros téléphoniques"
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Numéros de téléphones"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
+msgstr "Code PIN du téléphone"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr "Transférer les appels vers"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr "Numéros de téléphone"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr "Temps d'attente(s)"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "Phone macro"
 msgstr "Macro téléphoniques"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "fill out"
-msgstr "remplir"
+#: plugins/gofon/phoneaccount/generic.tpl:73
+#, fuzzy
+msgid "Refresh"
+msgstr "Rafraichir"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
-msgstr "Code PIN du téléphone"
+#: plugins/gofon/phoneaccount/generic.tpl:74
+#, fuzzy
+msgid "Complete"
+msgstr "incomplet"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 msgid "no macro"
@@ -8237,3 +8231,33 @@ 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é)  "
+
+#~ msgid "Generic queue setup"
+#~ msgstr "Paramètres de base des queues"
+
+#~ msgid "Phone Number"
+#~ msgstr "Numéro de téléphone"
+
+#, fuzzy
+#~ msgid "ring all available channels until one answers"
+#~ msgstr ""
+#~ "faire sonner tout les canaux disponibles jusqu'à ce que l'un deux réponde"
+
+#, fuzzy
+#~ msgid "take turns ringing each available interface"
+#~ msgstr "faire sonner les interfaces disponibles tour à tour"
+
+#, 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"
+
+#, 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"
+
+#~ msgid "ring random interface"
+#~ msgstr "Faire sonner un interface de manière aléatoire"
+
+#~ msgid "fill out"
+#~ msgstr "remplir"
index 2a511c1a3fd4cf3fd5ae26fed92ec1582538dc66..d70e6d79c18092713f8c387e42dfc20da63721d3 100644 (file)
@@ -48,7 +48,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -57,7 +57,7 @@ msgstr "Posta"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -72,7 +72,7 @@ msgstr "Connettività"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
@@ -85,7 +85,7 @@ msgstr "Fax"
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -114,7 +114,7 @@ msgstr "Applicazioni"
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr "Opzioni"
 
@@ -279,7 +279,7 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -306,10 +306,10 @@ msgstr "Aggiungi"
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -387,7 +387,7 @@ msgstr "Lista degli indirizzi alternativi"
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr "Rimuovi"
@@ -483,7 +483,7 @@ msgstr "disabilita tutte le opzioni di posta!"
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -663,7 +663,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr "Cambia la password"
 
@@ -761,14 +761,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Devi specificare la tua 'Password attuale' per procedere."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Le password nuova e ripetuta non corrispondono"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La password immessa come 'Nuova password' è vuota"
 
@@ -1546,7 +1546,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:902
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -1750,7 +1750,7 @@ msgstr "Organizzazione"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2351,7 +2351,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2363,19 +2363,19 @@ msgstr "Mostra dipartimenti"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2387,7 +2387,7 @@ msgstr "Lista dei dipartimenti"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2399,7 +2399,7 @@ msgstr "Termina sessione"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2410,7 +2410,7 @@ msgstr "Mostra utenti del dipartimento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2432,7 +2432,7 @@ msgstr "Liste di blocco"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2444,7 +2444,7 @@ msgstr "Password attuale"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2456,7 +2456,7 @@ msgstr "Mostra dipartimenti"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2467,7 +2467,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2478,7 +2478,7 @@ msgid "edit"
 msgstr "Modifica"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2486,7 +2486,7 @@ msgstr "Modifica contatto"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2497,7 +2497,7 @@ msgid "delete"
 msgstr "Rimuovi"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2511,7 +2511,7 @@ msgstr "Liste di blocco"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2590,7 +2590,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr "Lingua"
 
@@ -3451,7 +3451,7 @@ msgid "Delete this entry"
 msgstr "Rimuovi"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -3470,7 +3470,7 @@ msgid "Groupname"
 msgstr "Nome gruppo"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3797,55 +3797,55 @@ msgstr ""
 msgid "Users"
 msgstr "Utenti"
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:350
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:355
-#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new user"
 msgstr "Crea in"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "New user"
 msgstr "utenti"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 #, fuzzy
 msgid "Create new template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 #, fuzzy
 msgid "password"
 msgstr "Password"
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -3854,64 +3854,64 @@ msgstr "Password"
 msgid "Username"
 msgstr "Nome utente"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nuovo template"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Online"
 msgstr "nessuno"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -3956,11 +3956,10 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:44
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr ""
 
@@ -5273,7 +5272,6 @@ msgid "Choose a phone type"
 msgstr "Scegli il tuo numero di telefono personale"
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "refresh"
 msgstr ""
 
@@ -5967,125 +5965,122 @@ msgstr ""
 msgid "Queue Settings"
 msgstr "Impostazioni FAX"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr ""
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Numeri di telefono"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 #, fuzzy
 msgid "Generic queue Settings"
 msgstr "Informazioni generiche"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-#, fuzzy
-msgid "Phone Number"
-msgstr "Numero di telefono"
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Riprova"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 #, fuzzy
 msgid "Strategy"
 msgstr "Stato"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "Benvenuto %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 #, fuzzy
 msgid "Announce message"
 msgstr "Messaggio di di risposta automatica"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr ""
 
@@ -6138,51 +6133,53 @@ msgid "Yes"
 msgstr "Sistemi"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#, fuzzy
+msgid "ring all"
+msgstr "Terminali"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
+msgid "round robin"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
+msgid "least recently called"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
+msgid "fewest completed calls"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#, fuzzy
+msgid "random"
+msgstr "e"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "round robin with memory, remember where we left off last ring pass"
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 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/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6192,8 +6189,8 @@ msgid ""
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6201,15 +6198,15 @@ msgstr ""
 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
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, 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/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6431,39 +6428,39 @@ msgstr ""
 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:33
+#, fuzzy
+msgid "Phone PIN"
+msgstr "Telefono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr "Inoltra chiamate a"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr "Numero di telefono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr "Timeout"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 #, fuzzy
 msgid "Phone macro"
 msgstr "Rapporti telefono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:73
 #, fuzzy
-msgid "fill out"
-msgstr "Termina la sessione"
+msgid "Refresh"
+msgstr "Riferimenti"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/phoneaccount/generic.tpl:74
 #, fuzzy
-msgid "Phone PIN"
-msgstr "Telefono"
+msgid "Complete"
+msgstr "incompleto"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
@@ -7894,6 +7891,14 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "Phone Number"
+#~ msgstr "Numero di telefono"
+
+#, fuzzy
+#~ msgid "fill out"
+#~ msgstr "Termina la sessione"
+
 #, fuzzy
 #~ msgid "New system"
 #~ msgstr "Rimuovi"
@@ -7955,10 +7960,6 @@ msgstr ""
 #~ msgid "Deliver missed calls as mail"
 #~ msgstr "Recapita le chiamate perse come mail"
 
-#, fuzzy
-#~ msgid "Refresh"
-#~ msgstr "Riferimenti"
-
 #, fuzzy
 #~ msgid "Number"
 #~ msgstr "Novembre"
index 9e3523d345386253381f873214163ffc454a9048..738447c882ce6c1196c5c26eb850982ad5b46d9c 100644 (file)
@@ -31,7 +31,7 @@ msgstr ""
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -40,7 +40,7 @@ msgstr ""
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -55,7 +55,7 @@ msgstr ""
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr ""
@@ -68,7 +68,7 @@ msgstr ""
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -97,7 +97,7 @@ msgstr ""
 msgid "ACL"
 msgstr ""
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr ""
 
@@ -261,7 +261,7 @@ msgstr ""
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -288,10 +288,10 @@ msgstr ""
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -369,7 +369,7 @@ msgstr ""
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr ""
@@ -461,7 +461,7 @@ msgstr ""
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -634,7 +634,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr ""
 
@@ -725,14 +725,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr ""
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr ""
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1500,7 +1500,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -1510,7 +1510,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:902
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -1703,7 +1703,7 @@ msgstr ""
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2294,7 +2294,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2305,19 +2305,19 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2328,7 +2328,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2339,7 +2339,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2349,7 +2349,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2368,7 +2368,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2379,7 +2379,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2390,7 +2390,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2401,7 +2401,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2411,14 +2411,14 @@ msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 msgid "Edit user"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2428,7 +2428,7 @@ msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 msgid "Delete user"
 msgstr ""
@@ -2440,7 +2440,7 @@ msgstr ""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2517,7 +2517,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr ""
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr ""
 
@@ -3369,7 +3369,7 @@ msgid "Delete this entry"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 msgid "Posix"
 msgstr ""
 
@@ -3386,7 +3386,7 @@ msgid "Groupname"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3706,51 +3706,51 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:350
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:355
-#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "Create new user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 msgid "New user"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "Create new template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -3759,55 +3759,55 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 msgid "Edit UNIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 msgid "Edit fax properies"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 msgid "Create user from template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 msgid "Online"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 msgid "Offline"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -3852,11 +3852,10 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr ""
 
-#: plugins/admin/applications/headpage.tpl:44
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr ""
 
@@ -5136,7 +5135,6 @@ msgid "Choose a phone type"
 msgstr ""
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "refresh"
 msgstr ""
 
@@ -5813,118 +5811,116 @@ msgstr ""
 msgid "Queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 msgid "Generic queue Settings"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-msgid "Phone Number"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 msgid "Timeout"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 msgid "Strategy"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 msgid "Welcome sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 msgid "Announce message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 msgid "'Thank you' message"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr ""
 
@@ -5970,51 +5966,51 @@ msgid "Yes"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
+msgid "ring all"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
+msgid "round robin"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
+msgid "least recently called"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
+msgid "fewest completed calls"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
+msgid "random"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "round robin with memory, remember where we left off last ring pass"
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 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/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6024,8 +6020,8 @@ msgid ""
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6033,15 +6029,15 @@ msgstr ""
 msgid "Can't select database %s on %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:446
-#: plugins/admin/ogroups/class_phonequeue.inc:594
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:475
 #: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6238,35 +6234,34 @@ msgstr ""
 msgid "Phone macro management"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "Phone macro"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "fill out"
+#: plugins/gofon/phoneaccount/generic.tpl:73
+msgid "Refresh"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
+#: plugins/gofon/phoneaccount/generic.tpl:74
+msgid "Complete"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
index 19d2d797e7bea80786139d2bad6e1cab1901ae8a..9116f566ee66367d996af1cb25de54852e5573b8 100644 (file)
@@ -52,7 +52,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -61,7 +61,7 @@ msgstr "E-mail"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -76,7 +76,7 @@ msgstr "Verbindingen"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Fax"
@@ -89,7 +89,7 @@ msgstr "Fax"
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -118,7 +118,7 @@ msgstr "Programma's"
 msgid "ACL"
 msgstr "Rechten"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr "Opties"
 
@@ -282,7 +282,7 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -309,10 +309,10 @@ msgstr "Toevoegen"
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -390,7 +390,7 @@ msgstr "Lijst met alternatieve E-mail adressen"
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr "Verwijderen"
@@ -486,7 +486,7 @@ msgstr "schakelt alle E-mail opties uit!"
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -675,7 +675,7 @@ 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
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
@@ -775,7 +775,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -784,7 +784,7 @@ msgstr ""
 "overeen."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
@@ -1590,7 +1590,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
@@ -1600,7 +1600,7 @@ msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
 #: plugins/personal/generic/class_user.inc:902
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr "Het vereiste veld 'Voornaam' is leeg."
 
@@ -1797,7 +1797,7 @@ msgstr "Organisatie"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2407,7 +2407,7 @@ msgstr "Geef a.u.b. een geldig telefoonnummer op."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2419,19 +2419,19 @@ msgstr "Naam van de afdeling"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2443,7 +2443,7 @@ msgstr "Lijst met afdelingen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2455,7 +2455,7 @@ msgstr "Herstarten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2466,7 +2466,7 @@ msgstr "Selecteer om afdelingen te zien"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2488,7 +2488,7 @@ msgstr "Blokkeerlijsten"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2500,7 +2500,7 @@ msgstr "Huidig wachtwoord"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2512,7 +2512,7 @@ msgstr "Toon afdelingen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2523,7 +2523,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2534,7 +2534,7 @@ msgid "edit"
 msgstr "Bewerken"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2542,7 +2542,7 @@ msgstr "Record bewerken"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2553,7 +2553,7 @@ msgid "delete"
 msgstr "Verwijderen"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2567,7 +2567,7 @@ msgstr "Blokkeerlijst beheer"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2649,7 +2649,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Fax nummer waarop GOfax moet reageren"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr "Taal"
 
@@ -3544,7 +3544,7 @@ msgid "Delete this entry"
 msgstr "Verwijder ongebruikte"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -3563,7 +3563,7 @@ msgid "Groupname"
 msgstr "Groepnaam"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3905,56 +3905,56 @@ msgstr ""
 msgid "Users"
 msgstr "Gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 msgid "You are not allowed to set this users password!"
 msgstr ""
 "U heeft geen toestemming om het wachtwoord van deze gebruiker veranderen!"
 
-#: plugins/admin/users/class_userManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:350
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "U staat op het punt gebruiker %s te verwijderen."
 
-#: plugins/admin/users/class_userManagement.inc:355
-#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 msgid "You are not allowed to delete this user!"
 msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
 
-#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Er bestaat al een persoon met deze naam in deze tree."
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new user"
 msgstr "Maak record aan in"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "New user"
 msgstr "gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 #, fuzzy
 msgid "Create new template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord"
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -3963,65 +3963,65 @@ msgstr "Wachtwoord"
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Eigenschappen bewerken"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nieuw sjabloon"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Online"
 msgstr "online"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Offline"
 msgstr "offline"
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -4072,11 +4072,10 @@ msgstr ""
 "de selectie mogelijkheden te gebruiken."
 
 #: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr "Toon overeenkomende programma's"
 
-#: plugins/admin/applications/headpage.tpl:44
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr "Reguliere expressie voor overeenkomende programma namen"
 
@@ -5441,7 +5440,6 @@ 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"
 
@@ -6150,126 +6148,123 @@ msgstr ""
 msgid "Queue Settings"
 msgstr "Quota instellingen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr ""
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Telefoonnummers"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 #, fuzzy
 msgid "Generic queue Settings"
 msgstr "Algemene gebruikersinformatie"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-#, fuzzy
-msgid "Phone Number"
-msgstr "Telefoonnummer"
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 #, fuzzy
 msgid "Down"
 msgstr "Domein"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 #, fuzzy
 msgid "Timeout"
 msgstr "Timeout (s)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Opnieuw proberen"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 #, fuzzy
 msgid "Strategy"
 msgstr "Provincie"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "Welkom %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 #, fuzzy
 msgid "Announce message"
 msgstr "Afwezigheidsbericht"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 #, fuzzy
 msgid "'Thank you' message"
 msgstr "Status bericht"
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr ""
 
@@ -6328,52 +6323,54 @@ msgid "Yes"
 msgstr "ja"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#, fuzzy
+msgid "ring all"
+msgstr "Terminals"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
+msgid "round robin"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
+msgid "least recently called"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
+msgid "fewest completed calls"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#, fuzzy
+msgid "random"
+msgstr "en"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "round robin with memory, remember where we left off last ring pass"
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 #, fuzzy
 msgid "Timeout must be numeric"
 msgstr "De sieve poort dient nummeriek te zijn."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 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/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6383,8 +6380,8 @@ msgid ""
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6392,15 +6389,15 @@ msgstr ""
 msgid "Can't select database %s on %s."
 msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:446
-#: plugins/admin/ogroups/class_phonequeue.inc:594
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, fuzzy, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "De opgegeven database kon niet geselecteerd worden!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:475
 #: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6610,37 +6607,37 @@ msgstr ""
 msgid "Phone macro management"
 msgstr "Telefoon macrobeheer"
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Telefoonnummers"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Phone PIN"
+msgstr "Telefoon PIN"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr "Stuur oproepen door naar"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr "Timeout (s)"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "Phone macro"
 msgstr "Telefoon macro"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:73
 #, fuzzy
-msgid "fill out"
-msgstr "Uitloggen"
+msgid "Refresh"
+msgstr "ververs"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
-msgid "Phone PIN"
-msgstr "Telefoon PIN"
+#: plugins/gofon/phoneaccount/generic.tpl:74
+#, fuzzy
+msgid "Complete"
+msgstr "onvolledig"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 msgid "no macro"
@@ -8222,6 +8219,14 @@ msgstr ""
 "In sommige gevallen kan het handig zijn om foutrapportage aan te zetten "
 "(maar dit kan een veiligheidsrisico vormen) "
 
+#, fuzzy
+#~ msgid "Phone Number"
+#~ msgstr "Telefoonnummer"
+
+#, fuzzy
+#~ msgid "fill out"
+#~ msgstr "Uitloggen"
+
 #~ msgid "Display lists containing"
 #~ msgstr "Toon lijsten die het volgende bevatten"
 
index 983db791a8ecc3cd2eeff9bc19f383bbbaf6a953..24ef6e0791945021a806a9180690b23983bcab77 100644 (file)
@@ -47,7 +47,7 @@ msgstr "Unix"
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:707
+#: plugins/admin/users/class_userManagement.inc:708
 #: plugins/admin/ogroups/tabs_ogroups.inc:47
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
@@ -56,7 +56,7 @@ msgstr "Почта"
 
 #: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:714
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -71,7 +71,7 @@ msgstr "Подключение"
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:712
 #: plugins/admin/departments/generic.tpl:62
 msgid "Fax"
 msgstr "Факс"
@@ -84,7 +84,7 @@ msgstr "Факс"
 #: 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:709
+#: plugins/admin/users/class_userManagement.inc:710
 #: plugins/admin/departments/generic.tpl:58
 #: plugins/admin/systems/class_systemManagement.inc:702
 #: plugins/admin/systems/chooser.tpl:12
@@ -113,7 +113,7 @@ msgstr "Приложения"
 msgid "ACL"
 msgstr "Доступ"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:77 plugins/admin/ogroups/phonequeue.tpl:31
 msgid "Options"
 msgstr "Параметры"
 
@@ -279,7 +279,7 @@ msgstr "Имя пользователя, адрес которого показ
 #: 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/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:710
 msgid "Add"
@@ -306,10 +306,10 @@ msgstr "Добавить"
 #: 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/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
+#: plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:613
 #: plugins/admin/users/template.tpl:46
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:303
@@ -388,7 +388,7 @@ msgstr "Список альтернативных адресов эл. почт
 #: plugins/admin/systems/phonesettings.tpl:197
 #: 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/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/phonequeue.tpl:25
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/phoneaccount/generic.tpl:15
 msgid "Delete"
 msgstr "Удалить"
@@ -484,7 +484,7 @@ msgstr "отключает все почтовые настройки!"
 #: 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/users/class_userManagement.inc:611
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
 #: plugins/admin/systems/class_systemManagement.inc:527
@@ -666,7 +666,7 @@ msgstr ""
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -766,14 +766,14 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Для продолжения укажите свой текущий пароль."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:260
+#: plugins/admin/users/class_userManagement.inc:261
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
 msgstr "Введенные пароли не совпадают!"
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:265
+#: plugins/admin/users/class_userManagement.inc:266
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
@@ -1575,7 +1575,7 @@ msgstr "У вас недостаточно прав для создания по
 
 #: plugins/personal/generic/class_user.inc:887
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:528
+#: plugins/admin/users/class_userManagement.inc:529
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
@@ -1586,7 +1586,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:902
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
@@ -1784,7 +1784,7 @@ msgstr "Организация"
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:384
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:354
 #: plugins/admin/systems/class_systemManagement.inc:577
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
@@ -2409,7 +2409,7 @@ msgstr "Укажите корректный номер телефона."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
@@ -2421,19 +2421,19 @@ msgstr "Подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:648
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
 #: plugins/admin/systems/class_systemManagement.inc:553
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/ogroups/phonequeue.tpl:22
+#: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 msgid "Up"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2445,7 +2445,7 @@ msgstr "Список подразделений"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:648
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
 #: plugins/admin/systems/class_systemManagement.inc:554
@@ -2457,7 +2457,7 @@ msgstr "Перезагрузить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/systems/class_systemManagement.inc:555
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
@@ -2468,7 +2468,7 @@ msgstr "Выберите подразделение"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:650
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
 #: plugins/admin/systems/class_systemManagement.inc:555
@@ -2490,7 +2490,7 @@ msgstr "\"Черные списки\""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:655
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
 #: plugins/admin/systems/class_systemManagement.inc:564
@@ -2502,7 +2502,7 @@ msgstr "Текущий пароль"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2514,7 +2514,7 @@ msgstr "Показать подразделения"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:655
+#: plugins/admin/users/class_userManagement.inc:656
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
 #: plugins/admin/systems/class_systemManagement.inc:565
@@ -2525,7 +2525,7 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
 #: plugins/admin/systems/class_systemManagement.inc:570
@@ -2536,7 +2536,7 @@ msgid "edit"
 msgstr "Изменить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:658
+#: plugins/admin/users/class_userManagement.inc:659
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -2544,7 +2544,7 @@ msgstr "Пользователи домена"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
 #: plugins/admin/systems/class_systemManagement.inc:571
@@ -2555,7 +2555,7 @@ msgid "delete"
 msgstr "Удалить"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:661
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -2569,7 +2569,7 @@ msgstr "Управление \"черными списками\""
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/users/class_userManagement.inc:670
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
 #: plugins/admin/systems/class_systemManagement.inc:578
@@ -2650,7 +2650,7 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Номер факса, для которого сработает GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:28
+#: plugins/admin/ogroups/phonequeue.tpl:35
 msgid "Language"
 msgstr "Язык"
 
@@ -3552,7 +3552,7 @@ msgid "Delete this entry"
 msgstr "Удалить"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:705
+#: plugins/admin/users/class_userManagement.inc:706
 #, fuzzy
 msgid "Posix"
 msgstr "Прокси-сервер"
@@ -3571,7 +3571,7 @@ msgid "Groupname"
 msgstr "Группа"
 
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:668
+#: plugins/admin/users/class_userManagement.inc:669
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -3915,55 +3915,55 @@ msgstr ""
 msgid "Users"
 msgstr "Пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:243
-#: plugins/admin/users/class_userManagement.inc:313
+#: plugins/admin/users/class_userManagement.inc:244
+#: plugins/admin/users/class_userManagement.inc:314
 msgid "You are not allowed to set this users password!"
 msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:349
+#: plugins/admin/users/class_userManagement.inc:350
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Вы собираетесь удалить пользователя %s."
 
-#: plugins/admin/users/class_userManagement.inc:355
-#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:384
 msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:473
+#: plugins/admin/users/class_userManagement.inc:474
 #: plugins/admin/ogroups/class_ogroup.inc:201
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/users/class_userManagement.inc:540
+#: plugins/admin/users/class_userManagement.inc:541
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "Create new user"
 msgstr "Создание нового объекта в"
 
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:652
 #, fuzzy
 msgid "New user"
 msgstr "пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 #, fuzzy
 msgid "Create new template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:653
 msgid "New template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:660
 #, fuzzy
 msgid "password"
 msgstr "Пароль"
 
-#: plugins/admin/users/class_userManagement.inc:667
+#: plugins/admin/users/class_userManagement.inc:668
 #: 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
@@ -3972,65 +3972,65 @@ msgstr "Пароль"
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:673
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/users/class_userManagement.inc:704
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:704
+#: plugins/admin/users/class_userManagement.inc:705
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:706
+#: plugins/admin/users/class_userManagement.inc:707
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:709
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:711
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:713
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:715
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:716
 #, fuzzy
 msgid "Create user from template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:717
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Создать шаблон"
 
-#: plugins/admin/users/class_userManagement.inc:771
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Online"
 msgstr "в сети"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Offline"
 msgstr "не в сети"
 
-#: plugins/admin/users/class_userManagement.inc:980
+#: plugins/admin/users/class_userManagement.inc:981
 #: plugins/admin/users/template.tpl:11
 #: plugins/admin/systems/class_systemManagement.inc:699
 msgid "Template"
@@ -4082,11 +4082,10 @@ msgstr ""
 "использовать групповое выделение."
 
 #: plugins/admin/applications/headpage.tpl:38
-#: plugins/admin/applications/headpage.tpl:41
 msgid "Display applications matching"
 msgstr "Шаблон для приложений"
 
-#: plugins/admin/applications/headpage.tpl:44
+#: plugins/admin/applications/headpage.tpl:41
 msgid "Regular expression for matching application names"
 msgstr "Регулярное выражение, соответствующее именам приложений"
 
@@ -5484,7 +5483,6 @@ msgid "Choose a phone type"
 msgstr "Выберите тип мыши"
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:66
 msgid "refresh"
 msgstr ""
 
@@ -6207,126 +6205,123 @@ msgstr ""
 msgid "Queue Settings"
 msgstr "Настройки Samba"
 
-#: plugins/admin/ogroups/phonequeue.tpl:6
-msgid "Generic queue setup"
-msgstr ""
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+msgid "Phone numbers"
+msgstr "Телефонные номера"
 
 #: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:140
+#: plugins/admin/ogroups/phonequeue.tpl:137
 #, fuzzy
 msgid "Generic queue Settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/admin/ogroups/phonequeue.tpl:11
-#, fuzzy
-msgid "Phone Number"
-msgstr "Номер телефона"
-
-#: plugins/admin/ogroups/phonequeue.tpl:23
+#: plugins/admin/ogroups/phonequeue.tpl:18
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
 
-#: plugins/admin/ogroups/phonequeue.tpl:39
+#: plugins/admin/ogroups/phonequeue.tpl:46
 #, fuzzy
 msgid "Timeout"
 msgstr "Таймаут (с)"
 
-#: plugins/admin/ogroups/phonequeue.tpl:47
+#: plugins/admin/ogroups/phonequeue.tpl:54
 #: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Повторить"
 
-#: plugins/admin/ogroups/phonequeue.tpl:55
+#: plugins/admin/ogroups/phonequeue.tpl:62
 #, fuzzy
 msgid "Strategy"
 msgstr "Адм. единица"
 
-#: plugins/admin/ogroups/phonequeue.tpl:67
+#: plugins/admin/ogroups/phonequeue.tpl:74
 msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:75
+#: plugins/admin/ogroups/phonequeue.tpl:82
 msgid "Announce frequency"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:79
+#: plugins/admin/ogroups/phonequeue.tpl:86
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:84
+#: plugins/admin/ogroups/phonequeue.tpl:91
 msgid "Announce holdtime"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:98
+#: plugins/admin/ogroups/phonequeue.tpl:103
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:106
+#: plugins/admin/ogroups/phonequeue.tpl:109
 msgid "Allows calling user to transfer call"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:114
+#: plugins/admin/ogroups/phonequeue.tpl:115
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:122
+#: plugins/admin/ogroups/phonequeue.tpl:121
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:130
+#: plugins/admin/ogroups/phonequeue.tpl:127
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:138
+#: plugins/admin/ogroups/phonequeue.tpl:135
 msgid "Queue sound file setup"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:143
+#: plugins/admin/ogroups/phonequeue.tpl:140
 msgid "Use music on hold instead of ringing"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:152
+#: plugins/admin/ogroups/phonequeue.tpl:149
 msgid "Music on hold"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:160
+#: plugins/admin/ogroups/phonequeue.tpl:157
 #, fuzzy
 msgid "Welcome sound file"
 msgstr "Добро пожаловать %s!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:168
+#: plugins/admin/ogroups/phonequeue.tpl:165
 #, fuzzy
 msgid "Announce message"
 msgstr "Сообщение автоответчика"
 
-#: plugins/admin/ogroups/phonequeue.tpl:176
+#: plugins/admin/ogroups/phonequeue.tpl:173
 msgid "Sound file for 'You are next ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:184
+#: plugins/admin/ogroups/phonequeue.tpl:181
 msgid "'There are ...'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:192
+#: plugins/admin/ogroups/phonequeue.tpl:189
 msgid "'... calls waiting'"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:200
+#: plugins/admin/ogroups/phonequeue.tpl:197
 #, fuzzy
 msgid "'Thank you' message"
 msgstr "Сообщение о состоянии"
 
-#: plugins/admin/ogroups/phonequeue.tpl:208
+#: plugins/admin/ogroups/phonequeue.tpl:205
 msgid "'minutes' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:216
+#: plugins/admin/ogroups/phonequeue.tpl:213
 msgid "'seconds' sound file"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/phonequeue.tpl:221
 msgid "Hold sound file"
 msgstr ""
 
@@ -6387,51 +6382,53 @@ msgid "Yes"
 msgstr "Системы"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:136
-msgid "ring all available channels until one answers"
-msgstr ""
+#, fuzzy
+msgid "ring all"
+msgstr "Терминалы"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:137
-msgid "take turns ringing each available interface"
+msgid "round robin"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:138
-msgid "ring interface which was least recently called by this queue"
+msgid "least recently called"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:139
-msgid "ring the one with fewest completed calls from this queue"
+msgid "fewest completed calls"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:140
-msgid "ring random interface"
-msgstr ""
+#, fuzzy
+msgid "random"
+msgstr "и"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:141
-msgid "round robin with memory, remember where we left off last ring pass"
+msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:178
+#: plugins/admin/ogroups/class_phonequeue.inc:180
 msgid "Timeout must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:181
+#: plugins/admin/ogroups/class_phonequeue.inc:183
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:184
+#: plugins/admin/ogroups/class_phonequeue.inc:186
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:187
+#: plugins/admin/ogroups/class_phonequeue.inc:189
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:190
+#: plugins/admin/ogroups/class_phonequeue.inc:192
 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/admin/ogroups/class_phonequeue.inc:215
+#: plugins/admin/ogroups/class_phonequeue.inc:551
 #: plugins/gofon/macro/class_gofonMacro.inc:181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:241
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:972
@@ -6441,8 +6438,8 @@ msgid ""
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:223
-#: plugins/admin/ogroups/class_phonequeue.inc:559
+#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:561
 #: plugins/gofon/macro/class_gofonMacro.inc:192
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:252
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:983
@@ -6450,15 +6447,15 @@ msgstr ""
 msgid "Can't select database %s on %s."
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/admin/ogroups/class_phonequeue.inc:446
-#: plugins/admin/ogroups/class_phonequeue.inc:594
+#: plugins/admin/ogroups/class_phonequeue.inc:252
+#: plugins/admin/ogroups/class_phonequeue.inc:448
+#: plugins/admin/ogroups/class_phonequeue.inc:596
 #, fuzzy, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:475
 #: plugins/admin/ogroups/class_phonequeue.inc:477
+#: plugins/admin/ogroups/class_phonequeue.inc:479
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 #, php-format
@@ -6681,39 +6678,39 @@ msgstr ""
 msgid "Phone macro management"
 msgstr "Управление системами"
 
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-msgid "Phone numbers"
-msgstr "Телефонные номера"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+#, fuzzy
+msgid "Phone PIN"
+msgstr "Телефон"
 
-#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Forward calls to"
 msgstr "Перенаправлять звонки на"
 
-#: plugins/gofon/phoneaccount/generic.tpl:42
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:49
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Phone number"
 msgstr "Номер телефона"
 
-#: plugins/gofon/phoneaccount/generic.tpl:44
+#: plugins/gofon/phoneaccount/generic.tpl:51
 msgid "Timeout (s)"
 msgstr "Таймаут (с)"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:65
+#: plugins/gofon/phoneaccount/generic.tpl:66
 #, fuzzy
 msgid "Phone macro"
 msgstr "Телефонные отчеты"
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:73
 #, fuzzy
-msgid "fill out"
-msgstr "Ð\92Ñ\8bÑ\85од"
+msgid "Refresh"
+msgstr "СÑ\81Ñ\8bлки"
 
-#: plugins/gofon/phoneaccount/generic.tpl:78
+#: plugins/gofon/phoneaccount/generic.tpl:74
 #, fuzzy
-msgid "Phone PIN"
-msgstr "ТелеÑ\84он"
+msgid "Complete"
+msgstr "не Ð¿Ð¾Ð»Ð½Ñ\8bй"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:104
 #, fuzzy
@@ -8221,6 +8218,14 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "Phone Number"
+#~ msgstr "Номер телефона"
+
+#, fuzzy
+#~ msgid "fill out"
+#~ msgstr "Выход"
+
 #~ msgid "Display lists containing"
 #~ msgstr "Шаблон для содержимого стоп-листов"
 
@@ -8343,10 +8348,6 @@ msgstr ""
 #~ msgid "Deliver missed calls as mail"
 #~ msgstr "Сообщать о пропущеных звонка по почте"
 
-#, fuzzy
-#~ msgid "Refresh"
-#~ msgstr "Ссылки"
-
 #, fuzzy
 #~ msgid "Number"
 #~ msgstr "Ноябрь"