Code

Added Translation Strings.
authorjanw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 20 Aug 2007 08:55:20 +0000 (08:55 +0000)
committerjanw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 20 Aug 2007 08:55:20 +0000 (08:55 +0000)
Added German Translation.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7071 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/pl/LC_MESSAGES/messages.po
locale/ru/LC_MESSAGES/messages.po
locale/sv/LC_MESSAGES/messages.po
locale/zh/LC_MESSAGES/messages.po

index a6bfc2fc081b644e5e3d20dc6988bf170b2ace13..9db5f7250e6348dbef5d5a55fb38b216a6fe0eb0 100644 (file)
Binary files a/locale/de/LC_MESSAGES/messages.mo and b/locale/de/LC_MESSAGES/messages.mo differ
index 502d7d57b71ee690b5d04e63b974acae32949a81..4166813954d80e793e92463f5fd292c618211e98 100644 (file)
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
-"PO-Revision-Date: 2007-08-14 09:50+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
+"PO-Revision-Date: 2007-08-20 11:12+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,9 +32,9 @@ msgstr "Zusätzliches"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -162,9 +162,9 @@ msgid "ACL"
 msgstr "Zugriffsregeln"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Referenzen"
 
@@ -180,17 +180,17 @@ msgstr "Optionen"
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Start"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Geräte"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -198,7 +198,7 @@ msgstr "Geräte"
 msgid "Printer"
 msgstr "Drucker"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -216,9 +216,9 @@ msgstr "Drucker"
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -240,16 +240,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Repository"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "FAI Übersicht"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr "DNS"
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr "DHCP"
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -259,11 +267,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Excel-Export"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -274,15 +282,15 @@ msgstr "Excel-Export"
 msgid "Import"
 msgstr "Importieren"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -290,33 +298,33 @@ msgstr "Partitionen"
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Hooks"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variablen"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Übersicht"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Pakete"
 
@@ -335,7 +343,7 @@ msgstr "Pakete"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -410,7 +418,7 @@ msgstr "Speichern"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1047,7 +1055,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "Der Benutzer darf nur lokale Mails senden und empfangen"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
 
@@ -1384,7 +1392,7 @@ msgstr "Sie müssen das aktuelle Kennwort eingeben, um fortfahren zu können."
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1394,7 +1402,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Das Kennwort, welches Sie als 'Neues Kennwort' eingegeben haben ist leer."
@@ -1714,7 +1722,7 @@ msgstr "Benutzer %s Tage vor dem Ablauf des Kennwort es warnen"
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "deaktiviert"
 
@@ -2820,7 +2828,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "Das benötigte Feld 'Name' ist nicht gesetzt."
 
@@ -2830,7 +2838,7 @@ msgstr "Die von Ihnen angegebene 'Kennung' ist bereits vergeben."
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "Das benötigte Feld 'Vorname' ist nicht gesetzt."
 
@@ -4074,7 +4082,7 @@ msgstr "Übertragen"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4091,7 +4099,7 @@ msgid "edit"
 msgstr "Bearbeiten"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
@@ -4102,7 +4110,7 @@ msgstr "Benutzer bearbeiten"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4116,7 +4124,7 @@ msgid "delete"
 msgstr "Entfernen"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Benutzer entfernen"
 
@@ -4127,7 +4135,7 @@ msgstr "Anzahl der angezeigten Sperrlisten"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4893,6 +4901,7 @@ msgstr "Fehler"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Aktiv"
@@ -6237,7 +6246,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6246,7 +6255,7 @@ msgstr "Ausschneiden"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6255,7 +6264,7 @@ msgstr "Diesen Eintrag ausschneiden"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6264,7 +6273,7 @@ msgstr "Kopieren"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6737,7 +6746,7 @@ msgid "Groups"
 msgstr "Gruppen"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6998,7 +7007,7 @@ msgid "admin"
 msgstr "admin"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7327,22 +7336,30 @@ msgstr "Vorlage"
 msgid "Users"
 msgstr "Benutzer"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr "Konnte Benutzerstatus nicht von 'gesperrt' auf 'nicht gesperrt' setzen."
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr "Konnte Benutzerstatus nicht von 'nicht gesperrt' auf 'gesperrt' setzen."
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr "Sie haben keine Berechtigung, das Kennwort dieses Benutzers zu setzen!"
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, 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:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "Sie haben keine Berechtigung, diesen Benutzer zu löschen!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 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."
@@ -7478,15 +7495,19 @@ msgstr "Neuen Benutzer aus Vorlage erstellen"
 msgid "Create user with this template"
 msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+msgid "Deactivated"
+msgstr "deaktiviert"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "Kennwort"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Kennwort ändern"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr "Anzahl der angezeigten Benutzer"
 
@@ -10322,7 +10343,7 @@ msgstr "Integriertes Mikrofon"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10339,7 +10360,7 @@ msgstr "ja"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14808,7 +14829,7 @@ msgstr ""
 "Das in POSTCREATE angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14893,21 +14914,21 @@ msgstr "Zeile"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 "Das Setzen des Kennwortes ist fehlgeschlagen. Die Meldung vom LDAP-Server "
 "lautet '%s'."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 "Die Einstellung 'SMBHASH' in %s ist nicht korrekt! Das Samba-Kennwort kann "
 "nicht geändert werden."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -15413,8 +15434,8 @@ msgid ""
 "The timezone setting '%s' in your gosa.conf is not valid. Can not calculate "
 "correct timezone offset."
 msgstr ""
-"Die Zeitzonen-Einstellung '%s' in Ihrer gosa.conf ist ungültig. Kann den korrekten Zeitzonen-Versatz "
-"nicht ermitteln."
+"Die Zeitzonen-Einstellung '%s' in Ihrer gosa.conf ist ungültig. Kann den "
+"korrekten Zeitzonen-Versatz nicht ermitteln."
 
 #: include/class_timezones.inc:83
 #, php-format
@@ -16266,11 +16287,11 @@ msgstr "Die angegebene minimal Kennwortlänge ist nicht numerisch."
 msgid "The given password differ value is not numeric."
 msgstr "Der angegebene Kennwort Differenzwert ist nicht numerisch."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "GOsa-Einstellungen 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "Spezielle Parameter anpassen"
 
@@ -16525,19 +16546,19 @@ msgstr "Etwas ging schief während des Kopierens von DNs."
 msgid "I have read the license and accept it"
 msgstr "Ich habe die Lizenzbestimmungen gelesen und stimme diesen zu"
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "GOsa-Einstellungen 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr "Optimieren des GOsa Basisverhaltens"
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "Lebensdauer von Sitzungen muß ein numerischer Wert sein."
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Der Wert für maximale LDAP-Abfragedauer muß numerisch sein."
 
@@ -16578,26 +16599,34 @@ msgid "Enable Copy & Paste"
 msgstr "Ermögliche Kopieren &amp; Einfügen"
 
 #: setup/setup_config2.tpl:111
+msgid "Enable DNS extension"
+msgstr "DNS-Erweiterung aktivieren."
+
+#: setup/setup_config2.tpl:123
+msgid "Enable DHCP extension"
+msgstr "DHCP-Erweiterung aktivieren."
+
+#: setup/setup_config2.tpl:135
 msgid "Enable FAI release management"
 msgstr "Ermögliche FAI Release-Verwaltung"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr "Aktiviere Netatalk-Erweiterung für Benutzer"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "Behördenmodus"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "Zustellungs-Methode"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "Vorlage für Urlaubsmeldung"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr "Verwende Cyrus UNIX Stil"
 
@@ -17021,78 +17050,82 @@ msgid "Disable primary group filter"
 msgstr "Deaktiviere Filter für primäre Gruppe"
 
 #: setup/setup_config3.tpl:18
+msgid "Display summary in listings"
+msgstr "Zeige Zusammenfassung in Verzeichnissen"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Beachte administrative Einheiten"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Smarty Compileverzeichnis"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "Pfad zur PPD-Ablage"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Pfad zur Kiosk-Profil-Ablage"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Netzwerk-Auflösungs-Hook"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "Mail-Warteschlangen-Skript"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "Benachrichtigungsskript"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "Anmeldung und Sitzung"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr "Stelle sicher, dass register_globals nicht aktiv ist"
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "Erzwinge verschlüsselte Verbindungen"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "Warnen, wenn die Sitzung nicht verschlüsselt ist"
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "Lebensdauer von Sitzungen"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Fehlersuche"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "Zeige PHP Fehler"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "Maximale LDAP-Abfragedauer"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Protokolliere LDAP-Statistiken"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Debug-Level"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Aktiviert"
 
index 8a48e8fe7f73cfafa141c5fd07a716ac25cf7510..77994c0df03c9f2d6b61dd328fbd89956cb49716 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-07-30 01:11+0200\n"
 "Last-Translator: ALEJANDRO ESCANERO BLANCO\n"
 "Language-Team:  <aescanero@chaosdimension.org>\n"
@@ -30,9 +30,9 @@ msgstr "Añadidos"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -160,9 +160,9 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Referencias"
 
@@ -178,17 +178,17 @@ msgstr "Opciones"
 msgid "Parameter"
 msgstr "Parámetro"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -196,7 +196,7 @@ msgstr "Dispositivos"
 msgid "Printer"
 msgstr "Impresora"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -214,9 +214,9 @@ msgstr "Impresora"
 msgid "Information"
 msgstr "Información"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -238,16 +238,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Catálogo"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "Sumario FAI"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -257,11 +265,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Exportar en XLS"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -272,15 +280,15 @@ msgstr "Exportar en XLS"
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Particiones"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -288,33 +296,33 @@ msgstr "Particiones"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Métodos"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Plantillas"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Sumario"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Paquetes"
 
@@ -333,7 +341,7 @@ msgstr "Paquetes"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -408,7 +416,7 @@ msgstr "Guardar"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1044,7 +1052,7 @@ msgstr ""
 "El usuario solo esta permitido a enviar y recibir correo de forma local"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "Configuración de correo"
 
@@ -1385,7 +1393,7 @@ msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1395,7 +1403,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr "No ha introducido el campo 'Nueva contraseña'."
 
@@ -1714,7 +1722,7 @@ msgstr "Avisar al usuario %s días antes de que la contraseña expire"
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "desactivado"
 
@@ -2809,7 +2817,7 @@ msgstr "No tiene permisos para mover un usuario desde la 'Base' original."
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "No ha introducido el campo obligatorio 'Nombre'."
 
@@ -2819,7 +2827,7 @@ msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "No ha introducido el campo obligatorio 'Nombre de pila'."
 
@@ -4057,7 +4065,7 @@ msgstr "Enviar"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4074,7 +4082,7 @@ msgid "edit"
 msgstr "editar"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Editar usuario"
 
@@ -4085,7 +4093,7 @@ msgstr "Editar usuario"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4099,7 +4107,7 @@ msgid "delete"
 msgstr "eliminar"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Eliminar usuario"
 
@@ -4111,7 +4119,7 @@ msgstr "Nombre de la lista de bloqueos"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4884,6 +4892,7 @@ msgstr "Error"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Activo"
@@ -6226,7 +6235,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6235,7 +6244,7 @@ msgstr "mover"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6244,7 +6253,7 @@ msgstr "Mover esta entrada"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6253,7 +6262,7 @@ msgstr "copiar"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6728,7 +6737,7 @@ msgid "Groups"
 msgstr "Grupos"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6979,7 +6988,7 @@ msgid "admin"
 msgstr "Administrador"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7312,22 +7321,30 @@ msgstr "Plantilla"
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr "¡No le estátá permitido cambiarle la contraseña de estos usuarios!"
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de eliminar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "¡No le está permitido eliminar este usuario!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Ya existe una persona con el nombre elegido en este árbol."
 
@@ -7461,15 +7478,20 @@ msgstr "Crear usuario desde plantilla"
 msgid "Create user with this template"
 msgstr "Crear usuario con esta plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Activado"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "contraseña"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -10303,7 +10325,7 @@ msgstr "Micrófono integrado"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10320,7 +10342,7 @@ msgstr "Si"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14831,7 +14853,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14916,20 +14938,20 @@ msgstr "Linea"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 "Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 "¡Configuración para SMBHASH en %s es incorrecta! No se podrán cambiar las "
 "contraseñas Samba."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -16287,11 +16309,11 @@ msgstr ""
 "El valor indicado como diferencias mínimas de la contraseña no es un valor "
 "numérico."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "Configuración GOsa 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "Personalizar parametros especiales"
 
@@ -16537,19 +16559,19 @@ msgstr "Se produjo un error mientras se copiaba dns."
 msgid "I have read the license and accept it"
 msgstr "He leído la licencia y la acepto"
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "Configuración GOsa 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr "Ajustar el comportamiento del núcleo común de GOsa"
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "Tiempo de vida de sesión debe ser un valor numérico"
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Máximo tiempo de consulta LDAP debe ser un valor numérico."
 
@@ -16591,26 +16613,36 @@ msgid "Enable Copy & Paste"
 msgstr "Activar Copiar y Pegar"
 
 #: setup/setup_config2.tpl:111
+#, fuzzy
+msgid "Enable DNS extension"
+msgstr "Activar DNS para este dispositivo"
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "Inspección LDAP"
+
+#: setup/setup_config2.tpl:135
 msgid "Enable FAI release management"
 msgstr "Activar Administración de versiones FAI"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr "Activar extensión de usuario Netatalk"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "Modo gubernamental"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "Método de correo"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "Plantillas de ausencia"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr "Usa estilo Cyrus UNIX"
 
@@ -17030,78 +17062,83 @@ msgid "Disable primary group filter"
 msgstr "Desactivar filtro del grupo primario"
 
 #: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "Mostrar macros que coincidan con"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Delegar en unidades administrativas"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Directorio de compilación Smarty"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "Ruta del almacén PPD"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Ruta del almacén de perfiles kiosk"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Método de resolución de Nombres"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "Script de cola de correo"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "Script de notificación"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "Inicio y sesión"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr "Forzar register_globals para que sea desactivado"
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "Forzar conexiones seguras"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "Avisar si la sesión no esta codificada"
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "Duración de sesiones."
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Depurando"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "Mostrar errores PHP:"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "Tiempo de consulta máxima de LDAP"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Registrar estadísticas LDAP"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Nivel de depuración"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Activado"
 
index ecf5aeff88473fd547461aa529b06f78852e7ced..3871a13e49153139e9c608d1f42c6d4e453d5500 100644 (file)
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-08-06 12:32+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -28,9 +28,9 @@ msgstr "Extensions"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -158,9 +158,9 @@ msgid "ACL"
 msgstr ""
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Références"
 
@@ -176,17 +176,17 @@ msgstr "Options"
 msgid "Parameter"
 msgstr "Paramètres"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Démarrage"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Périphériques"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -194,7 +194,7 @@ msgstr "Périphériques"
 msgid "Printer"
 msgstr "Imprimante"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -212,9 +212,9 @@ msgstr "Imprimante"
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -236,16 +236,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Dépôt"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "Sommaire FAI"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -255,11 +263,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exporter"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Exporter en Excel"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -270,15 +278,15 @@ msgstr "Exporter en Excel"
 msgid "Import"
 msgstr "Importer"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "Importer un fichier CSV"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Partitions"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -286,33 +294,33 @@ msgstr "Partitions"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Connexions"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Modèles"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profils"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Sommaire"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Paquets"
 
@@ -331,7 +339,7 @@ msgstr "Paquets"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -406,7 +414,7 @@ msgstr "Enregistrer"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1047,7 +1055,7 @@ msgstr ""
 "locaux"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
 
@@ -1386,7 +1394,7 @@ msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1396,7 +1404,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
@@ -1720,7 +1728,7 @@ msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "désactivé"
 
@@ -2820,7 +2828,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
 
@@ -2830,7 +2838,7 @@ msgstr "Une personne ayant cet 'Identifiant' existe déjà dans l'annuaire."
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "Le champ obligatoire 'Nom Complet' n'est pas rempli."
 
@@ -4084,7 +4092,7 @@ msgstr "Soumettre"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4101,7 +4109,7 @@ msgid "edit"
 msgstr "éditer"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Editer un utilisateur"
 
@@ -4112,7 +4120,7 @@ msgstr "Editer un utilisateur"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4126,7 +4134,7 @@ msgid "delete"
 msgstr "supprimer"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Supprimer un utilisateur"
 
@@ -4138,7 +4146,7 @@ msgstr "Nom de la liste rouge"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4915,6 +4923,7 @@ msgstr "Erreur"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Actif"
@@ -6260,7 +6269,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6269,7 +6278,7 @@ msgstr "couper"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6278,7 +6287,7 @@ msgstr "Couper cette entrée"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6287,7 +6296,7 @@ msgstr "copier"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6768,7 +6777,7 @@ msgid "Groups"
 msgstr "Groupes"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -7028,7 +7037,7 @@ msgid "admin"
 msgstr "administrateur"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7358,23 +7367,31 @@ msgstr "Modèle"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 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:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, 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:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "Vous n'êtes pas autorisé à supprimer cet utilisateur!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 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."
 
@@ -7510,15 +7527,20 @@ msgstr "Créer un nouvel utilisateur depuis un modèle"
 msgid "Create user with this template"
 msgstr "Créer un nouvel utilisateur avec ce modèle"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Activé"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "mot de passe"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -10369,7 +10391,7 @@ msgstr "Micro intégré"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10386,7 +10408,7 @@ msgstr "Oui"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14878,7 +14900,7 @@ msgstr ""
 "La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
 "pas."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14963,21 +14985,21 @@ msgstr "Ligne"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 "La modification a échoué du mot de passe à échoué. Le serveur LDAP répond '%"
 "s'."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 "La configuration de SMBHASH dans %s est incorrecte ! Impossible de changer "
 "le mot de passe Samba."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -16333,11 +16355,11 @@ msgstr "La longueur minimale du mot de passe n'est pas une valeur numérique."
 msgid "The given password differ value is not numeric."
 msgstr "L'option password differ n'est pas une valeur numérique."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "Paramètres de GOsa 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "Customiser les paramètres spéciaux"
 
@@ -16581,19 +16603,19 @@ msgstr "Une erreur s'est produite lors de la copie du dns."
 msgid "I have read the license and accept it"
 msgstr "J'ai lu la licence et je l'accepte"
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "Paramètres de GOsa 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr "Customiser certains paramètres essentiels de GOsa"
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "La durée de la session doit être une valeur numérique."
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Le temps maximumpour une requête ldap doit être une valeur numérique."
 
@@ -16634,26 +16656,36 @@ msgid "Enable Copy & Paste"
 msgstr "Activer le Copier / Coller"
 
 #: setup/setup_config2.tpl:111
+#, fuzzy
+msgid "Enable DNS extension"
+msgstr "Activer le DNS pour ce périphérique"
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "Editer une section DHCP"
+
+#: setup/setup_config2.tpl:135
 msgid "Enable FAI release management"
 msgstr "Activer la gestion des versions FAI"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr "Activer la gestion des comptes Netatalk"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "Mode Gouvernemental"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "Méthode de messagerie"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "Modèles de messages d'absence "
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr "Utiliser Cyrus en mode UNIX"
 
@@ -17077,78 +17109,83 @@ msgid "Disable primary group filter"
 msgstr "Désactiver le filtre sur les groupes primaires"
 
 #: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "Afficher les macros correspondantes"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Honorer les entités administratives"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Répertoire de compilation de smarty"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "Répertoire pour le stockage des PPD"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Répertoire pour le stockage des profiles kiosk"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Connexions pour les Résolution réseaux"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "Script pour la gestion de la queue du serveur de messagerie"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "Script de notification"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "connexion et session"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr "Force register_globals à être désactivé"
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "Force les connexions cryptées"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "Avertir si la session ne sera pas cryptée"
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "Durée de vie de la session"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Deboguage"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "Afficher les erreur PHP"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "Durée maximale d'une requête LDAP"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Inscrit les statistique de l'annuaire LDAP dans les journaux systèmes"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Niveau de débogage"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Activé"
 
index a8aecf1b18254e698f932756d2050cadadf3b905..1b4cb15d6c231c952772a974b0e87efe7548193b 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-07-13 18:38+0100\n"
 "Last-Translator: Guido Serra <zeph@purotesto.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,9 +29,9 @@ msgstr "Moduli aggiuntivi"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -160,9 +160,9 @@ msgid "ACL"
 msgstr "Liste controllo accessi (ACL)"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Referenze"
 
@@ -178,17 +178,17 @@ msgstr "Opzioni"
 msgid "Parameter"
 msgstr "Parametri"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Avvio"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Componenti (device)"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -196,7 +196,7 @@ msgstr "Componenti (device)"
 msgid "Printer"
 msgstr "Stampanti"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -214,9 +214,9 @@ msgstr "Stampanti"
 msgid "Information"
 msgstr "Informazione"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 #, fuzzy
 msgid "Inventory"
 msgstr "Aggiungi elenco/inventario"
@@ -239,16 +239,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Repository"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "Sommario installazioni remote (FAI)"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OpenGroupware (OGo)"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -258,11 +266,11 @@ msgstr "OpenGroupware (OGo)"
 msgid "Export"
 msgstr "Esporta"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Esporta formato Excel"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -273,15 +281,15 @@ msgstr "Esporta formato Excel"
 msgid "Import"
 msgstr "Importa"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "Importa formato CSV"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Partizioni"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -289,33 +297,33 @@ msgstr "Partizioni"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Gancio..staccato (Hooks)?????? "
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variabili"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Modelli"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profili"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Sommario"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Pacchetti"
 
@@ -334,7 +342,7 @@ msgstr "Pacchetti"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -409,7 +417,7 @@ msgstr "Salva"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1045,7 +1053,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "L'utente può solo spedire e ricevere mail in locale"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "Settaggi di posta"
 
@@ -1385,7 +1393,7 @@ msgstr "Dovete specificare la vostra password per procedere."
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1395,7 +1403,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La password che hai inserito come 'Nuova password' è vuota."
 
@@ -1719,7 +1727,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "Disabilitato"
 
@@ -2820,7 +2828,7 @@ msgstr "Non hai il permesso di spostare un utente dalla 'Base' originale."
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "Il capo obbligatorio 'Nome' non è compilato."
 
@@ -2830,7 +2838,7 @@ msgstr "C'è già una persona con questo 'codice utente (login)' nel database."
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "Il campo obligatorio 'Nome (given name??)' non è completato."
 
@@ -4082,7 +4090,7 @@ msgstr "Invia"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4099,7 +4107,7 @@ msgid "edit"
 msgstr "Modifica"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Modifica utente"
 
@@ -4110,7 +4118,7 @@ msgstr "Modifica utente"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4124,7 +4132,7 @@ msgid "delete"
 msgstr "Cancella"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Cancella utente"
 
@@ -4136,7 +4144,7 @@ msgstr "Nome della lista di blocco"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4905,6 +4913,7 @@ msgstr "Errore"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Attivo"
@@ -6246,7 +6255,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6255,7 +6264,7 @@ msgstr "taglia"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6264,7 +6273,7 @@ msgstr "Taglia questo valore"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6273,7 +6282,7 @@ msgstr "copia"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6758,7 +6767,7 @@ msgid "Groups"
 msgstr "Gruppi"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 #, fuzzy
@@ -7014,7 +7023,7 @@ msgid "admin"
 msgstr "Amministratori"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7343,22 +7352,30 @@ msgstr "Modello"
 msgid "Users"
 msgstr "Utente"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr "Non ti è permesso di impostare la password dell'utente!"
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Stai per cancellare l'utente %s."
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "Non ti è permesso di cancelale qusto utente!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con questo nome è già in uso in questa struttura."
 
@@ -7493,15 +7510,20 @@ msgstr "Crea utente da un modello"
 msgid "Create user with this template"
 msgstr "Crea utente con questo modello"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Attivate"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "Password"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Cambia la password"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -10321,7 +10343,7 @@ msgstr "Microfono integrato"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10338,7 +10360,7 @@ msgstr "Sì"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14889,7 +14911,7 @@ msgstr ""
 "Il comando '%s', specificato come POSTCREATE per il plugin '%s' non sembra "
 "esistere."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14975,19 +14997,19 @@ msgstr "Linea"
 msgid "Arguments"
 msgstr "Argomenti"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Impostazione della password fallita. Il server LDAP ha risposto '%s'."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, fuzzy, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 "Le impostazioni per MBHASH in gosa.conf sono inesatte! Non posso cambiare la "
 "password di Samba."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -16343,12 +16365,12 @@ msgstr "La porta Sieve deve essere indicata con un numero."
 msgid "The given password differ value is not numeric."
 msgstr "La porta Sieve deve essere indicata con un numero."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 #, fuzzy
 msgid "GOsa settings 2/3"
 msgstr "Settaggi di posta"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 #, fuzzy
 msgid "Customize special parameters"
 msgstr "Verifica i parametri"
@@ -16603,21 +16625,21 @@ msgstr ""
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 #, fuzzy
 msgid "GOsa settings 3/3"
 msgstr "Settaggi di posta"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 #, fuzzy
 msgid "Session lifetime must be a numeric value."
 msgstr "Il punteggio richiesto deve essere numerico."
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 #, fuzzy
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Il punteggio richiesto deve essere numerico."
@@ -16666,29 +16688,39 @@ msgstr ""
 
 #: setup/setup_config2.tpl:111
 #, fuzzy
+msgid "Enable DNS extension"
+msgstr "Abilità il DNS per questo componente"
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "Ispezione setup PHP"
+
+#: setup/setup_config2.tpl:135
+#, fuzzy
 msgid "Enable FAI release management"
 msgstr "Gestione conferenze"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 #, fuzzy
 msgid "Enable user netatalk plugin"
 msgstr "Gestisci gli utenti Netatalk"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 #, fuzzy
 msgid "Government mode"
 msgstr "Nome del dipartimento"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "Metodo di posta"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Modello delle workstation"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -17099,92 +17131,97 @@ msgstr "Mostra gruppi di utenti"
 
 #: setup/setup_config3.tpl:18
 #, fuzzy
+msgid "Display summary in listings"
+msgstr "Mostra le macro corrispondenti"
+
+#: setup/setup_config3.tpl:30
+#, fuzzy
 msgid "Honour administrative units"
 msgstr "Gruppo Amministrativo"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 #, fuzzy
 msgid "Smarty compile directory"
 msgstr "Home directory"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 #, fuzzy
 msgid "Path for PPD storage"
 msgstr "Archiviazione password"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 #, fuzzy
 msgid "Path for kiosk profile storage"
 msgstr "Definizione profilo Kiosk"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 #, fuzzy
 msgid "Network resolv hook"
 msgstr "Indirizzo della rete"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 #, fuzzy
 msgid "Mail queue script"
 msgstr "Coda delle mail"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 #, fuzzy
 msgid "Notification script"
 msgstr "Periodo di notifica dell'Host"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 #, fuzzy
 msgid "Enforce encrypted connections"
 msgstr "Blocca archivi criptati"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 #, fuzzy
 msgid "Warn if session is not encrypted"
 msgstr "La sessione non è criptata."
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 #, fuzzy
 msgid "Session lifetime"
 msgstr "Conflitto di sessione individuato"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 #, fuzzy
 msgid "Debugging"
 msgstr "Attiva il debug"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 #, fuzzy
 msgid "Show PHP errors"
 msgstr "Errore PHP"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 #, fuzzy
 msgid "Maximum LDAP query time"
 msgstr "massiam dimensione file"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 #, fuzzy
 msgid "Debug level"
 msgstr "Livello dei log"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 #, fuzzy
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 #, fuzzy
 msgid "Enabled"
 msgstr "Disabilitato"
@@ -18090,9 +18127,6 @@ msgstr "Salvataggio del telefono fallito"
 #~ msgid "Skript name"
 #~ msgstr "Nome script"
 
-#~ msgid "Display macros  matching"
-#~ msgstr "Mostra le macro corrispondenti"
-
 #, fuzzy
 #~ msgid "Select none"
 #~ msgstr "Cancella utente"
index 768f155f39ffa34f1362f9f18b61169c20b221c0..6bade643aa0c7edfcca0abea444bd4b17843c015 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,9 +30,9 @@ msgstr ""
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -160,9 +160,9 @@ msgid "ACL"
 msgstr ""
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr ""
 
@@ -178,17 +178,17 @@ msgstr ""
 msgid "Parameter"
 msgstr ""
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr ""
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -196,7 +196,7 @@ msgstr ""
 msgid "Printer"
 msgstr ""
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -214,9 +214,9 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr ""
 
@@ -238,16 +238,24 @@ msgstr ""
 msgid "Repository"
 msgstr ""
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -257,11 +265,11 @@ msgstr ""
 msgid "Export"
 msgstr ""
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr ""
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -272,15 +280,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr ""
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr ""
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -288,33 +296,33 @@ msgstr ""
 msgid "Script"
 msgstr ""
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr ""
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr ""
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr ""
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr ""
 
@@ -333,7 +341,7 @@ msgstr ""
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -408,7 +416,7 @@ msgstr ""
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1031,7 +1039,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr ""
 
@@ -1343,7 +1351,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1351,7 +1359,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1655,7 +1663,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr ""
 
@@ -2698,7 +2706,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -2708,7 +2716,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -3907,7 +3915,7 @@ msgstr ""
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -3924,7 +3932,7 @@ msgid "edit"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr ""
 
@@ -3935,7 +3943,7 @@ msgstr ""
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -3949,7 +3957,7 @@ msgid "delete"
 msgstr ""
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr ""
 
@@ -3960,7 +3968,7 @@ msgstr ""
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4695,6 +4703,7 @@ msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr ""
@@ -5958,7 +5967,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -5967,7 +5976,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -5976,7 +5985,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -5985,7 +5994,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6439,7 +6448,7 @@ msgid "Groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6682,7 +6691,7 @@ msgid "admin"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6985,22 +6994,30 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -7131,15 +7148,19 @@ msgstr ""
 msgid "Create user with this template"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+msgid "Deactivated"
+msgstr ""
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -9806,7 +9827,7 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -9823,7 +9844,7 @@ msgstr ""
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -13979,7 +14000,7 @@ msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14058,17 +14079,17 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -15274,11 +15295,11 @@ msgstr ""
 msgid "The given password differ value is not numeric."
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr ""
 
@@ -15511,19 +15532,19 @@ msgstr ""
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
@@ -15564,26 +15585,34 @@ msgid "Enable Copy & Paste"
 msgstr ""
 
 #: setup/setup_config2.tpl:111
-msgid "Enable FAI release management"
+msgid "Enable DNS extension"
 msgstr ""
 
 #: setup/setup_config2.tpl:123
+msgid "Enable DHCP extension"
+msgstr ""
+
+#: setup/setup_config2.tpl:135
+msgid "Enable FAI release management"
+msgstr ""
+
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr ""
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -15947,78 +15976,82 @@ msgid "Disable primary group filter"
 msgstr ""
 
 #: setup/setup_config3.tpl:18
-msgid "Honour administrative units"
+msgid "Display summary in listings"
 msgstr ""
 
 #: setup/setup_config3.tpl:30
+msgid "Honour administrative units"
+msgstr ""
+
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr ""
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr ""
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr ""
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr ""
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr ""
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr ""
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr ""
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr ""
 
index 952fe78c15b45fd166f9b9c9dd218340603511c4..2cda033abc955e55097feb0206c54b0819e64dc8 100644 (file)
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-07-19 16:40+0200\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -33,9 +33,9 @@ msgstr "Plugins"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -163,9 +163,9 @@ msgid "ACL"
 msgstr "Rechten"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Referenties"
 
@@ -181,17 +181,17 @@ msgstr "Opties"
 msgid "Parameter"
 msgstr "Parameters"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Opstarten"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Apparaten"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -199,7 +199,7 @@ msgstr "Apparaten"
 msgid "Printer"
 msgstr "Printer"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -217,9 +217,9 @@ msgstr "Printer"
 msgid "Information"
 msgstr "Informatie"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -241,16 +241,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Verzamelplaats"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "FAI samenvatting"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -260,11 +268,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exporteer"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Excel export"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -275,15 +283,15 @@ msgstr "Excel export"
 msgid "Import"
 msgstr "Importeren"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "CSV Import"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Partities"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -291,33 +299,33 @@ msgstr "Partities"
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Inhakers"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variabelen"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Sjablonen"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profielen"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Samenvatting"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Pakketten"
 
@@ -336,7 +344,7 @@ msgstr "Pakketten"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -411,7 +419,7 @@ msgstr "Opslaan"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1044,7 +1052,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "E-mail instellingen"
 
@@ -1379,7 +1387,7 @@ msgstr "U moet uw huidige wachtwoord opgeven om door te kunnen gaan."
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1389,7 +1397,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Het nieuw ingevoerde wachtwoord is leeg."
 
@@ -1710,7 +1718,7 @@ msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "gedeactiveerd"
 
@@ -2802,7 +2810,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "Het vereiste veld '(Achter)naam' is leeg."
 
@@ -2812,7 +2820,7 @@ msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "Het vereiste veld 'Voornaam' is leeg."
 
@@ -4049,7 +4057,7 @@ msgstr "Verwerk"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4066,7 +4074,7 @@ msgid "edit"
 msgstr "Bewerk"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
@@ -4077,7 +4085,7 @@ msgstr "Bewerk gebruiker"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4091,7 +4099,7 @@ msgid "delete"
 msgstr "Verwijder"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Verwijder gebruiker"
 
@@ -4103,7 +4111,7 @@ msgstr "Naam van de blokkeerlijst"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4867,6 +4875,7 @@ msgstr "Fout"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Actief"
@@ -6206,7 +6215,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6215,7 +6224,7 @@ msgstr "knippen"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6224,7 +6233,7 @@ msgstr "Deze invoer knippen"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6233,7 +6242,7 @@ msgstr "kopieer"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6709,7 +6718,7 @@ msgid "Groups"
 msgstr "Groepen"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6966,7 +6975,7 @@ msgid "admin"
 msgstr "Beheerder"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7291,23 +7300,31 @@ msgstr "Sjabloon"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 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:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, 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:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 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:553
+#: plugins/admin/users/class_userManagement.inc:594
 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."
 
@@ -7441,15 +7458,20 @@ msgstr "Maak gebruiker aan vanuit sjabloon"
 msgid "Create user with this template"
 msgstr "Maak gebruiker aan met dit sjabloon"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Geactiveerd"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "wachtwoord"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -10290,7 +10312,7 @@ msgstr "Geintegreerde microfoon"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10307,7 +10329,7 @@ msgstr "Ja"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14802,7 +14824,7 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
 "bestaat niet."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14886,19 +14908,19 @@ msgstr "Regel"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Instellen van het wachtwoord is mislukt. De LDAP server meldt: '%s'."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 "De instelling voor 'SMBHASH' in %s is niet correct. Kan het samba wachtwoord "
 "niet veranderen."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -16247,11 +16269,11 @@ msgstr "De opgegeven minimale wachtwoord lengte is niet nummeriek."
 msgid "The given password differ value is not numeric."
 msgstr "De opgegeven wachtwoord verschil waarde is niet nummeriek."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "GOsa instellingen 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "Speciale parameters aanpassen"
 
@@ -16497,19 +16519,19 @@ msgstr "Er is iets misgegaan bij het lopieren van DNS"
 msgid "I have read the license and accept it"
 msgstr "Ik heb de licentie overeenkomst gelezen en geaccepteerd"
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "GOsa instellingen 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr "Enkele GOsa basis instellingen fijnafstemmen"
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "De sessie levensduur moet een nummerieke waarde zijn"
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Maximale LDAP verzoek tijd moet een nummerieke waarde zijn."
 
@@ -16551,26 +16573,36 @@ msgid "Enable Copy & Paste"
 msgstr "Kopieren en plakken gebruiken"
 
 #: setup/setup_config2.tpl:111
+#, fuzzy
+msgid "Enable DNS extension"
+msgstr "DNS voor dit apparaat activeren"
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "LDAP controle"
+
+#: setup/setup_config2.tpl:135
 msgid "Enable FAI release management"
 msgstr "FAI uitrol beheer gebruiken"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr "Netatalk voor gebruikers gebruiken"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "Overheidsmodus"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "E-mail methode"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "Afwezigheidsbericht sjablonen"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr "Gebruik Cyrus UNIX style modus"
 
@@ -16987,78 +17019,83 @@ msgid "Disable primary group filter"
 msgstr "Schakel primair groep filter uit."
 
 #: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "Toon overeenkomende macro's"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Gebruik beheer eenheden"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Smarty compileer map"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "Pad voor PPD opslag"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Pad voor kiosk profiel opslag"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Netwerk resolutie inhaker"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "Mail wachtrij script"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "Notificatie script"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "Inloggen en sessie"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr "Vereis register_globals uit"
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "Vereis beveiligde verbindingen"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "Waarschuw bij nietversleutelde sessie"
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "Sessie levensduur"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Debuggen"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "Toon PHP fouten"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "Maximale LDAP zoek duur"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Log LDAP statistieken"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Debug nivo"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
@@ -17923,9 +17960,6 @@ msgstr "Schema controle is mislukt"
 #~ msgid "Skript name"
 #~ msgstr "Scriptnaam"
 
-#~ msgid "Display macros  matching"
-#~ msgstr "Toon overeenkomende macro's"
-
 #, fuzzy
 #~ msgid "Select none"
 #~ msgstr "Verwijder gebruiker"
index e480e1d67e0584e24fa2f1374620e782b7f97000..a5202341b3b5914802acf34b6a1ea82ac4d88fae 100644 (file)
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-08-09 22:17+0100\n"
 "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -28,9 +28,9 @@ msgstr "Dodatki"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -158,9 +158,9 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Zależności"
 
@@ -176,17 +176,17 @@ msgstr "Opcje"
 msgid "Parameter"
 msgstr "Parametr"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Startup"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Urządzenia"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -194,7 +194,7 @@ msgstr "Urządzenia"
 msgid "Printer"
 msgstr "Drukarka"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -212,9 +212,9 @@ msgstr "Drukarka"
 msgid "Information"
 msgstr "Informacja"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr "Inwentarz"
 
@@ -236,16 +236,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Repozytorium"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "Podsumowanie FAI"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -255,11 +263,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Export"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Export do Excela"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -270,15 +278,15 @@ msgstr "Export do Excela"
 msgid "Import"
 msgstr "Import"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "Import z CSV"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Partycje"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -286,33 +294,33 @@ msgstr "Partycje"
 msgid "Script"
 msgstr "Skrypt"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Zaczepy"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Zmienie"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Szablony"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profile"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Pakiety"
 
@@ -331,7 +339,7 @@ msgstr "Pakiety"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -406,7 +414,7 @@ msgstr "Zapisz"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1033,7 +1041,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "Użytkownik może tylko wysyłać i odbierać lokalną pocztę"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
 
@@ -1353,7 +1361,7 @@ msgstr "Proszę podać obecne hasło aby kontynuować."
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1361,7 +1369,7 @@ msgstr "Podane hasła 'Nowe hasło' oraz 'Powtórz nowe hasło' nie są itentycz
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Hasło które podano jako 'Nowe hasło' jest puste."
 
@@ -1674,7 +1682,7 @@ msgstr "Ostrzeż użytkownika na %s dni przed wygaśnięciem hasła"
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "wyłączone"
 
@@ -2746,7 +2754,7 @@ msgstr "Brak uprawnień do przenoszenia konta z obecnego 'Kontenera'."
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "Wymagane pole 'Nazwa' jest puste."
 
@@ -2756,7 +2764,7 @@ msgstr "Już istnieje osoba z takim samym loginem w bazie."
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "Wymagane pole 'Podana nazwa' jest puste."
 
@@ -3989,7 +3997,7 @@ msgstr "Wyślij"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4006,7 +4014,7 @@ msgid "edit"
 msgstr "edytuj"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Edytuj użytkownika"
 
@@ -4017,7 +4025,7 @@ msgstr "Edytuj użytkownika"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4031,7 +4039,7 @@ msgid "delete"
 msgstr "Usuń"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Usuń użytkownika"
 
@@ -4043,7 +4051,7 @@ msgstr "Nazwa bloklisty"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4799,6 +4807,7 @@ msgstr "Błąd"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Aktywne"
@@ -6125,7 +6134,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6134,7 +6143,7 @@ msgstr "wytnij"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6143,7 +6152,7 @@ msgstr "Wytnij ten obiekt"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6152,7 +6161,7 @@ msgstr "kopiuj"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6631,7 +6640,7 @@ msgid "Groups"
 msgstr "Grupy"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 #, fuzzy
@@ -6886,7 +6895,7 @@ msgid "admin"
 msgstr "admin"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7204,22 +7213,30 @@ msgstr "Szablon"
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr "Brak uprawnień do zmiany hasła tym użytkownikom!"
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Zamierzasz usunąć użytkownika %s."
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "Brak uprawnień do usunięcia tego użytkownika!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Osoba o wybranej nazwie już istnieje w tym drzewie."
 
@@ -7353,15 +7370,20 @@ msgstr "Utwórz użytkownika z szablonu"
 msgid "Create user with this template"
 msgstr "Utwórz użytkownika z tego szablonu"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Aktywne"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "hasło"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -10150,7 +10172,7 @@ msgstr "Zintegrowany mikrofon"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10167,7 +10189,7 @@ msgstr "Tak"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14599,7 +14621,7 @@ msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s' podane jako POSTCREATE dla dodatku '%s' nie istnieje."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14679,19 +14701,19 @@ msgstr "Linia"
 msgid "Arguments"
 msgstr "Argumenty"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Ustawianie hasła nieudane, Odpowiedź serwera LDAP '%s'."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, fuzzy, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 "Parametr SMBHASH w gosa.conf jest nieprawidłowy! Nie można zmienić hasła "
 "Samba."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -15989,11 +16011,11 @@ msgstr "Podana wartość minimalnej długości hasła nie jet liczbą."
 msgid "The given password differ value is not numeric."
 msgstr "Podana wartość różnicy hasła nie jest liczbą."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "Ustawienia GOsa 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "Dostosuj specjalne parametry"
 
@@ -16228,19 +16250,19 @@ msgstr ""
 msgid "I have read the license and accept it"
 msgstr "Przeczytałem licencję i akceptuję ją"
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "Ustawienia GOsa 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "Czas życia sesji musi być wartością liczbową."
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Maksymalny czas zapytania LDAP musi być wartością liczbową."
 
@@ -16281,26 +16303,36 @@ msgid "Enable Copy & Paste"
 msgstr ""
 
 #: setup/setup_config2.tpl:111
+#, fuzzy
+msgid "Enable DNS extension"
+msgstr "Włącz DNS dla tego urządzenia."
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "Inspekcja LDAP"
+
+#: setup/setup_config2.tpl:135
 msgid "Enable FAI release management"
 msgstr "Włącz zarządzanie wydaniem FAI"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr "Włącz dodatek użytkownika netatalk"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "Tryb Government"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "Typ pocztowy"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "Szablony autorespondera"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -16675,78 +16707,83 @@ msgid "Disable primary group filter"
 msgstr "Wyłącz filtr grupy podstawowej"
 
 #: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "Wyświetl makra pasujące"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Honoruj jednostki administracyjne"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Katalog kompilacji Smarty"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "Ścieżka do przechowywania PPD"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Ścieżka dla przechowywania profilu kiosk"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Zaczep do resolvera sieciowego"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "Skrypt kolejki pocztowej"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "Skrypt powiadamiania"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "Logowanie i sesja"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "Wymuś szyfrowane połączenia"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "Ostrzeż jeśli sesja nie jest szyfrowana"
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "czas życia sesji"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Debugowanie"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "Pokazuj błędy PHP"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "Maksymalny czas zapytania LDAP"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Loguj statystyki LDAP"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Poziom debugu"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Włączone"
 
@@ -17555,9 +17592,6 @@ msgstr "Sprawdzanie schematu nieudane"
 #~ msgid "Skript name"
 #~ msgstr "Nazwa skryptu"
 
-#~ msgid "Display macros  matching"
-#~ msgstr "Wyświetl makra pasujące"
-
 #, fuzzy
 #~ msgid "Select none"
 #~ msgstr "Usuń użytkownika"
index c777bec68d5d094391ae5c9be04ced63f45ef893..2c8e878699ac51bd0f57bf8c350eaa333cbdcd7c 100644 (file)
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-07-16 10:53+0300\n"
 "Last-Translator: Vitaly Kuznetsov <vitty@altlinux.ru>\n"
 "Language-Team: ALT Linux Team\n"
@@ -30,9 +30,9 @@ msgstr "Дополнительно"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -161,9 +161,9 @@ msgid "ACL"
 msgstr "Доступ"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Ссылки"
 
@@ -179,17 +179,17 @@ msgstr "Параметры"
 msgid "Parameter"
 msgstr "Параметр"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "Запуск"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Устройства"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -197,7 +197,7 @@ msgstr "Устройства"
 msgid "Printer"
 msgstr "Принтер"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -215,9 +215,9 @@ msgstr "Принтер"
 msgid "Information"
 msgstr "Информация"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 #, fuzzy
 msgid "Inventory"
 msgstr "Добавить инвентаризацию"
@@ -240,16 +240,25 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Репозитарий"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "Резюме FAI"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+#, fuzzy
+msgid "DNS"
+msgstr "DNS"
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr "DHCP"
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -259,11 +268,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Экспорт"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Экспорт в Excel"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -274,15 +283,15 @@ msgstr "Экспорт в Excel"
 msgid "Import"
 msgstr "Импортировать"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "Импортир из CSV"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Партиции"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -290,33 +299,33 @@ msgstr "Партиции"
 msgid "Script"
 msgstr "Скрипт"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "Триггеры"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Переменные"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Профили"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Резюме"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Пакеты"
 
@@ -335,7 +344,7 @@ msgstr "Пакеты"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -410,7 +419,7 @@ msgstr "Сохранить"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1040,7 +1049,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "Пользователь может отправлять и получать почту только локально"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "Почтовые настройки"
 
@@ -1368,7 +1377,7 @@ msgstr "Для продолжения укажите свой текущий п
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1376,7 +1385,7 @@ msgstr "Введенные пароли не совпадают!"
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr "Вы не указали новый пароль."
 
@@ -1698,7 +1707,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "отключен"
 
@@ -2781,7 +2790,7 @@ msgstr "У вас недостаточно прав для перемещени
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "Обязательное поле \"Имя\" не заполнено."
 
@@ -2792,7 +2801,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "Обязательное поле \"Личное имя\" не заполнено."
 
@@ -4037,7 +4046,7 @@ msgstr "Отправить"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -4054,7 +4063,7 @@ msgid "edit"
 msgstr "редактировать"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Редактировать пользователя"
 
@@ -4065,7 +4074,7 @@ msgstr "Редактировать пользователя"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -4079,7 +4088,7 @@ msgid "delete"
 msgstr "удалить"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Удалить пользователя"
 
@@ -4091,7 +4100,7 @@ msgstr "Имя стоп-листа"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4851,6 +4860,7 @@ msgstr "Ошибка"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Активный"
@@ -6172,7 +6182,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6181,7 +6191,7 @@ msgstr "вырезать"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6190,7 +6200,7 @@ msgstr "Вырезать этот объект"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6199,7 +6209,7 @@ msgstr "скопировать"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6680,7 +6690,7 @@ msgid "Groups"
 msgstr "Группы"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6933,7 +6943,7 @@ msgid "admin"
 msgstr "администратор"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7258,22 +7268,30 @@ msgstr "Шаблон"
 msgid "Users"
 msgstr "Пользователи"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr "У вас недостаточно прав для смены пароля этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Вы собираетесь удалить пользователя %s."
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "У вас недостаточно прав для удаления этого пользователя!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Пользователь с таким именем уже есть в этой ветке."
 
@@ -7409,15 +7427,20 @@ msgstr "Создать пользователя по шаблону"
 msgid "Create user with this template"
 msgstr "Создать пользователя по этому шаблону"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Активирован"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "пароль"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -10199,7 +10222,7 @@ msgstr "Всроенный микрофон"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -10216,7 +10239,7 @@ msgstr "Да"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14666,7 +14689,7 @@ msgid ""
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14748,17 +14771,17 @@ msgstr "строка"
 msgid "Arguments"
 msgstr "Аргументы"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "Ошибка при установке пароля. Ответ LDAP-сервера: \"%s\"."
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr "Параметр SMBHASH в %s некорректен! Не удается сменить пароль Samba."
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -16069,11 +16092,11 @@ msgstr "Данная минимальная длина пароля не чис
 msgid "The given password differ value is not numeric."
 msgstr "Различия в вводимом пароле должно быть числовым."
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "Настроки GOsa 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "Настройте специальные параметры"
 
@@ -16310,19 +16333,19 @@ msgstr "Что-то случилось в процессе копировани
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "Настройка GOsa 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr "Изменить некоторое поведение ядра GOsa"
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "Время жизни сесси должно быть численым."
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "Максимальное время запроса LDAP должно быть численым."
 
@@ -16366,27 +16389,37 @@ msgstr "Включить Копирование/Вставку"
 
 #: setup/setup_config2.tpl:111
 #, fuzzy
+msgid "Enable DNS extension"
+msgstr "Включить DNS для данного устройства"
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "Проверка LDAP"
+
+#: setup/setup_config2.tpl:135
+#, fuzzy
 msgid "Enable FAI release management"
 msgstr "Название"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 #, fuzzy
 msgid "Enable user netatalk plugin"
 msgstr "Управление учётной записью nettalk"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "Правительственный режим"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "Почтовый метод"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "Шаблон автоответчика"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr "Использовать стиль Cyrus UNIX"
 
@@ -16800,78 +16833,83 @@ msgid "Disable primary group filter"
 msgstr "Отключить основной фильтр групп"
 
 #: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "Шаблон для групп"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Соблюдать административные единицы"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Каталог компилирования Smarty"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "Путь к хранилищу PPD"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Путь хранения профиля kiosk"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Триггер выполнения resolv"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "Скрипт почтовой очереди"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "Скрипт уведомления"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "Вход и сессия"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr "Форсировать чтобы register_globals  были выключены"
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "Форсировать защищённые соединения"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "Предупреждать если сессия не зашифрована."
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "Время жизни сессии"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Отладка"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "Показывать ошибки PHP"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "Максимальное время запроса к LDAP"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Записывать статистику LDAP"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Уровень отладки"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Отключен"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Включен"
 
@@ -17682,10 +17720,6 @@ msgstr "Проверка схем не удалась"
 #~ msgid "Skript name"
 #~ msgstr "Список"
 
-#, fuzzy
-#~ msgid "Display macros  matching"
-#~ msgstr "Шаблон для групп"
-
 #, fuzzy
 #~ msgid "Select none"
 #~ msgstr "Удалить"
@@ -18335,10 +18369,6 @@ msgstr "Проверка схем не удалась"
 #~ msgid "DNS-Zone"
 #~ msgstr "нет"
 
-#, fuzzy
-#~ msgid "DNS-TTL"
-#~ msgstr "DNS"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Выбрать"
@@ -18943,9 +18973,6 @@ msgstr "Проверка схем не удалась"
 #~ msgid "LDIF CSV import"
 #~ msgstr "Экспорт в LDIF"
 
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
 #, fuzzy
 #~ msgid "Kolab Hosts"
 #~ msgstr "Моя учетная запись"
index bc8d29d05890f8b6f9539be94555002e74f3dde6..b9894c8a4f98e5a4852f8262250a7ac65a231be9 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gosa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-07-31 19:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -29,9 +29,9 @@ msgstr "Tillägg"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -159,9 +159,9 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "Referenser"
 
@@ -177,17 +177,17 @@ msgstr "Alternativ"
 msgid "Parameter"
 msgstr "Parameter"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr ""
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "Enheter"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -195,7 +195,7 @@ msgstr "Enheter"
 msgid "Printer"
 msgstr "Skrivare"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -213,9 +213,9 @@ msgstr "Skrivare"
 msgid "Information"
 msgstr "Information"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr ""
 
@@ -237,16 +237,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "Förråd"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -256,11 +264,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "Exportera"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "Excel-export"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -271,15 +279,15 @@ msgstr "Excel-export"
 msgid "Import"
 msgstr "Importera"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "CSV-import"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "Partitioner"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -287,33 +295,33 @@ msgstr "Partitioner"
 msgid "Script"
 msgstr "Skript"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "Variabler"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "Mallar"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profiler"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "Sammandrag"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "Paket"
 
@@ -332,7 +340,7 @@ msgstr "Paket"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -407,7 +415,7 @@ msgstr "Spara"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1030,7 +1038,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr ""
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "E-postinställningar"
 
@@ -1342,7 +1350,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1350,7 +1358,7 @@ msgstr ""
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr ""
 
@@ -1654,7 +1662,7 @@ msgstr ""
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "inaktiverad"
 
@@ -2697,7 +2705,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr ""
 
@@ -2707,7 +2715,7 @@ msgstr ""
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr ""
 
@@ -3906,7 +3914,7 @@ msgstr "Skicka"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -3923,7 +3931,7 @@ msgid "edit"
 msgstr "redigera"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "Redigera användare"
 
@@ -3934,7 +3942,7 @@ msgstr "Redigera användare"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -3948,7 +3956,7 @@ msgid "delete"
 msgstr "ta bort"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "Ta bort användare"
 
@@ -3959,7 +3967,7 @@ msgstr ""
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4695,6 +4703,7 @@ msgstr "Fel"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "Aktiv"
@@ -5960,7 +5969,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -5969,7 +5978,7 @@ msgstr "klipp ut"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -5978,7 +5987,7 @@ msgstr ""
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -5987,7 +5996,7 @@ msgstr "kopiera"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6443,7 +6452,7 @@ msgid "Groups"
 msgstr "Grupper"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6687,7 +6696,7 @@ msgid "admin"
 msgstr ""
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -6990,22 +6999,30 @@ msgstr "Mall"
 msgid "Users"
 msgstr "Användare"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr ""
 
@@ -7136,15 +7153,20 @@ msgstr "Skapa användare från mall"
 msgid "Create user with this template"
 msgstr "Skapa användare med den här mallen"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "Aktiverad"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "lösenord"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -9822,7 +9844,7 @@ msgstr "Integrerad mikrofon"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -9839,7 +9861,7 @@ msgstr "Ja"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14042,7 +14064,7 @@ msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14121,17 +14143,17 @@ msgstr "Rad"
 msgid "Arguments"
 msgstr "Argument"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -15344,11 +15366,11 @@ msgstr ""
 msgid "The given password differ value is not numeric."
 msgstr ""
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "GOsa inställningar 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr ""
 
@@ -15582,19 +15604,19 @@ msgstr ""
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "GOsa inställningar 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr ""
 
@@ -15635,26 +15657,35 @@ msgid "Enable Copy & Paste"
 msgstr ""
 
 #: setup/setup_config2.tpl:111
-msgid "Enable FAI release management"
+msgid "Enable DNS extension"
 msgstr ""
 
 #: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "LDAP-inspektion"
+
+#: setup/setup_config2.tpl:135
+msgid "Enable FAI release management"
+msgstr ""
+
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr ""
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr ""
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
@@ -16018,78 +16049,82 @@ msgid "Disable primary group filter"
 msgstr ""
 
 #: setup/setup_config3.tpl:18
-msgid "Honour administrative units"
+msgid "Display summary in listings"
 msgstr ""
 
 #: setup/setup_config3.tpl:30
+msgid "Honour administrative units"
+msgstr ""
+
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr ""
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr ""
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr ""
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr ""
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr ""
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr ""
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr ""
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr ""
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr ""
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr ""
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Felsökning"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr ""
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr ""
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr ""
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Felsökningsnivå"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "Aktiverad"
 
index e9cc5789e2c2a99021361b869e31d47d917c7bb2..c527c5d16ee2f4bd28e5ae768f560aee8fd27b7a 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-14 09:49+0200\n"
+"POT-Creation-Date: 2007-08-20 11:09+0200\n"
 "PO-Revision-Date: 2007-07-11 18:45+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -30,9 +30,9 @@ msgstr "插件"
 
 #: contrib/gosa.conf:104 contrib/gosa.conf:128 contrib/gosa.conf:132
 #: contrib/gosa.conf:141 contrib/gosa.conf:147 contrib/gosa.conf:152
-#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:187
-#: contrib/gosa.conf:202 contrib/gosa.conf:208 contrib/gosa.conf:231
-#: contrib/gosa.conf:237 contrib/gosa.conf:243 contrib/gosa.conf:247
+#: contrib/gosa.conf:158 contrib/gosa.conf:168 contrib/gosa.conf:197
+#: contrib/gosa.conf:212 contrib/gosa.conf:218 contrib/gosa.conf:241
+#: contrib/gosa.conf:247 contrib/gosa.conf:253 contrib/gosa.conf:257
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -160,9 +160,9 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:137 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:183
-#: contrib/gosa.conf:198 contrib/gosa.conf:204 contrib/gosa.conf:210
-#: contrib/gosa.conf:233 contrib/gosa.conf:239
+#: contrib/gosa.conf:154 contrib/gosa.conf:164 contrib/gosa.conf:193
+#: contrib/gosa.conf:208 contrib/gosa.conf:214 contrib/gosa.conf:220
+#: contrib/gosa.conf:243 contrib/gosa.conf:249
 msgid "References"
 msgstr "引用"
 
@@ -178,17 +178,17 @@ msgstr "选项"
 msgid "Parameter"
 msgstr "参数"
 
-#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:188
+#: contrib/gosa.conf:159 contrib/gosa.conf:169 contrib/gosa.conf:198
 #: plugins/admin/ogroups/tabs_ogroups.inc:107
 msgid "Startup"
 msgstr "启动"
 
-#: contrib/gosa.conf:160 contrib/gosa.conf:189
+#: contrib/gosa.conf:160 contrib/gosa.conf:199
 #: plugins/admin/ogroups/tabs_ogroups.inc:101
 msgid "Devices"
 msgstr "设备"
 
-#: contrib/gosa.conf:161 contrib/gosa.conf:190
+#: contrib/gosa.conf:161 contrib/gosa.conf:200
 #: plugins/personal/environment/environment.tpl:171
 #: plugins/admin/systems/class_systemManagement.inc:878
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
@@ -196,7 +196,7 @@ msgstr "设备"
 msgid "Printer"
 msgstr "打印机"
 
-#: contrib/gosa.conf:162 contrib/gosa.conf:181 contrib/gosa.conf:191
+#: contrib/gosa.conf:162 contrib/gosa.conf:191 contrib/gosa.conf:201
 #: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/admin/fai/faiProfileEntry.tpl:21
@@ -214,9 +214,9 @@ msgstr "打印机"
 msgid "Information"
 msgstr "提示信息"
 
-#: contrib/gosa.conf:163 contrib/gosa.conf:182 contrib/gosa.conf:197
-#: contrib/gosa.conf:203 contrib/gosa.conf:209 contrib/gosa.conf:232
-#: contrib/gosa.conf:238
+#: contrib/gosa.conf:163 contrib/gosa.conf:192 contrib/gosa.conf:207
+#: contrib/gosa.conf:213 contrib/gosa.conf:219 contrib/gosa.conf:242
+#: contrib/gosa.conf:248
 msgid "Inventory"
 msgstr "清单"
 
@@ -238,16 +238,24 @@ msgstr "Kolab"
 msgid "Repository"
 msgstr "仓库"
 
-#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:193
-#: contrib/gosa.conf:195
+#: contrib/gosa.conf:177 contrib/gosa.conf:179 contrib/gosa.conf:203
+#: contrib/gosa.conf:205
 msgid "FAI summary"
 msgstr "自动化安装说明"
 
-#: contrib/gosa.conf:260
+#: contrib/gosa.conf:182 contrib/gosa.conf:184
+msgid "DNS"
+msgstr ""
+
+#: contrib/gosa.conf:187 contrib/gosa.conf:189
+msgid "DHCP"
+msgstr ""
+
+#: contrib/gosa.conf:270
 msgid "OGo"
 msgstr "OGo"
 
-#: contrib/gosa.conf:272 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:282 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -257,11 +265,11 @@ msgstr "OGo"
 msgid "Export"
 msgstr "导出"
 
-#: contrib/gosa.conf:273
+#: contrib/gosa.conf:283
 msgid "Excel Export"
 msgstr "导出为 Excel"
 
-#: contrib/gosa.conf:274 plugins/personal/mail/generic.tpl:192
+#: contrib/gosa.conf:284 plugins/personal/mail/generic.tpl:192
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -272,15 +280,15 @@ msgstr "导出为 Excel"
 msgid "Import"
 msgstr "导入"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:285
 msgid "CSV Import"
 msgstr "CSV 导入"
 
-#: contrib/gosa.conf:280 contrib/gosa.conf:310
+#: contrib/gosa.conf:290 contrib/gosa.conf:320
 msgid "Partitions"
 msgstr "分区"
 
-#: contrib/gosa.conf:284 contrib/gosa.conf:314
+#: contrib/gosa.conf:294 contrib/gosa.conf:324
 #: plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
@@ -288,33 +296,33 @@ msgstr "分区"
 msgid "Script"
 msgstr "脚本"
 
-#: contrib/gosa.conf:288 contrib/gosa.conf:318
+#: contrib/gosa.conf:298 contrib/gosa.conf:328
 #: plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr "钩子"
 
-#: contrib/gosa.conf:292 contrib/gosa.conf:322
+#: contrib/gosa.conf:302 contrib/gosa.conf:332
 #: plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
 msgstr "变量"
 
-#: contrib/gosa.conf:296 contrib/gosa.conf:326
+#: contrib/gosa.conf:306 contrib/gosa.conf:336
 #: plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
 msgstr "模板"
 
-#: contrib/gosa.conf:300 contrib/gosa.conf:330
+#: contrib/gosa.conf:310 contrib/gosa.conf:340
 #: plugins/personal/environment/environment.tpl:7
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Profiles"
 
-#: contrib/gosa.conf:301 contrib/gosa.conf:331
+#: contrib/gosa.conf:311 contrib/gosa.conf:341
 #: plugins/admin/ogroups/tabs_ogroups.inc:110
 msgid "Summary"
 msgstr "总结"
 
-#: contrib/gosa.conf:305 contrib/gosa.conf:335
+#: contrib/gosa.conf:315 contrib/gosa.conf:345
 msgid "Packages"
 msgstr "软件包"
 
@@ -333,7 +341,7 @@ msgstr "软件包"
 #: plugins/admin/fai/class_faiManagement.inc:608
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:343
-#: plugins/admin/users/class_userManagement.inc:647
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:360
 #: plugins/admin/departments/class_departmentManagement.inc:297
 #: plugins/admin/systems/servnfs.tpl:120
@@ -408,7 +416,7 @@ msgstr "保存"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
-#: plugins/admin/users/class_userManagement.inc:649
+#: plugins/admin/users/class_userManagement.inc:690
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
@@ -1031,7 +1039,7 @@ msgid "User is only allowed to send and receive local mails"
 msgstr "用户只能发送和接收本地邮件"
 
 #: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#: setup/setup_config2.tpl:143
+#: setup/setup_config2.tpl:167
 msgid "Mail settings"
 msgstr "邮件选项"
 
@@ -1343,7 +1351,7 @@ msgstr "您需要输入当前口令才能继续。"
 
 #: plugins/personal/password/class_password.inc:74
 #: plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:243 html/password.php:186
+#: plugins/admin/users/class_userManagement.inc:284 html/password.php:186
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1351,7 +1359,7 @@ msgstr "您输入的“新口令”和“重复新口令”不匹配。"
 
 #: plugins/personal/password/class_password.inc:76
 #: plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:248 html/password.php:189
+#: plugins/admin/users/class_userManagement.inc:289 html/password.php:189
 msgid "The password you've entered as 'New password' is empty."
 msgstr "输入的“新口令”为空。"
 
@@ -1658,7 +1666,7 @@ msgstr "在口令过期 %s 天之前警告用户"
 #: plugins/personal/posix/class_posixAccount.inc:558
 #: plugins/personal/samba/class_sambaAccount.inc:491
 #: plugins/admin/systems/class_terminalGeneric.inc:114
-#: setup/setup_config2.tpl:151
+#: setup/setup_config2.tpl:175
 msgid "disabled"
 msgstr "禁用"
 
@@ -2701,7 +2709,7 @@ msgstr "您无权从原 'Base' 移动一个用户。"
 
 #: plugins/personal/generic/class_user.inc:1031
 #: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:582
 msgid "The required field 'Name' is not set."
 msgstr "需要的“姓名”字段没有设置"
 
@@ -2711,7 +2719,7 @@ msgstr "数据库中已经有同样登录名的用户。"
 
 #: plugins/personal/generic/class_user.inc:1046
 #: plugins/addons/addressbook/class_addressbook.inc:559
-#: plugins/admin/users/class_userManagement.inc:544
+#: plugins/admin/users/class_userManagement.inc:585
 msgid "The required field 'Given name' is not set."
 msgstr "需要的“教名”字段没有设置"
 
@@ -3919,7 +3927,7 @@ msgstr "提交"
 #: plugins/admin/fai/class_divListFai.inc:230
 #: plugins/admin/fai/class_divListFai.inc:235
 #: plugins/admin/groups/class_divListGroup.inc:157
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:202
 #: plugins/admin/applications/class_divListApplication.inc:156
 #: plugins/admin/departments/class_divListDepartment.inc:98
 #: plugins/admin/systems/glpiPrinter.tpl:15
@@ -3936,7 +3944,7 @@ msgid "edit"
 msgstr "编辑"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:203
 msgid "Edit user"
 msgstr "编辑用户"
 
@@ -3947,7 +3955,7 @@ msgstr "编辑用户"
 #: plugins/admin/fai/class_faiHook.inc:270
 #: plugins/admin/fai/class_divListFai.inc:237
 #: plugins/admin/groups/class_divListGroup.inc:161
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:218
 #: plugins/admin/applications/class_divListApplication.inc:163
 #: plugins/admin/departments/class_divListDepartment.inc:102
 #: plugins/admin/systems/class_divListSystem.inc:149
@@ -3961,7 +3969,7 @@ msgid "delete"
 msgstr "删除"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:96
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:219
 msgid "Delete user"
 msgstr "删除用户"
 
@@ -3973,7 +3981,7 @@ msgstr "黑名单名称"
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:120
 #: plugins/admin/fai/class_divListFai.inc:269
 #: plugins/admin/groups/class_divListGroup.inc:213
-#: plugins/admin/users/class_divListUsers.inc:279
+#: plugins/admin/users/class_divListUsers.inc:299
 #: plugins/admin/applications/class_divListApplication.inc:196
 #: plugins/admin/departments/class_divListDepartment.inc:128
 #: plugins/admin/systems/class_divListSystem.inc:226
@@ -4714,6 +4722,7 @@ msgstr "错误"
 
 #: plugins/addons/mailqueue/contents.tpl:76
 #: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/admin/users/class_divListUsers.inc:187
 #: include/sieve/class_sieveManagement.inc:647
 msgid "Active"
 msgstr "活动"
@@ -5999,7 +6008,7 @@ msgstr "PK"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6008,7 +6017,7 @@ msgstr "剪切"
 
 #: plugins/admin/fai/class_divListFai.inc:223
 #: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:196
 #: plugins/admin/applications/class_divListApplication.inc:147
 #: plugins/admin/ogroups/class_divListOGroup.inc:137
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:161
@@ -6017,7 +6026,7 @@ msgstr "剪切条目"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6026,7 +6035,7 @@ msgstr "复制"
 
 #: plugins/admin/fai/class_divListFai.inc:226
 #: plugins/admin/groups/class_divListGroup.inc:154
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:198
 #: plugins/admin/applications/class_divListApplication.inc:151
 #: plugins/admin/ogroups/class_divListOGroup.inc:139
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:163
@@ -6491,7 +6500,7 @@ msgid "Groups"
 msgstr "用户组"
 
 #: plugins/admin/groups/class_groupManagement.inc:142
-#: plugins/admin/users/class_userManagement.inc:126
+#: plugins/admin/users/class_userManagement.inc:127
 #: plugins/admin/ogroups/class_ogroupManagement.inc:137
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:168
 msgid "You are not allowed to execute this method!"
@@ -6738,7 +6747,7 @@ msgid "admin"
 msgstr "管理员"
 
 #: plugins/admin/groups/class_groupMail.inc:293
-#: plugins/admin/users/class_userManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:516
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:388
 #: plugins/admin/systems/class_SelectDeviceType.inc:24
 #: plugins/admin/ogroups/class_ogroup.inc:281
@@ -7046,22 +7055,30 @@ msgstr "模板"
 msgid "Users"
 msgstr "用户"
 
-#: plugins/admin/users/class_userManagement.inc:221
-#: plugins/admin/users/class_userManagement.inc:297
+#: plugins/admin/users/class_userManagement.inc:170
+msgid "Could not set user status from locked to unlocked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:172
+msgid "Could not set user status from unlocked to locked."
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:262
+#: plugins/admin/users/class_userManagement.inc:338
 msgid "You are not allowed to set this users password!"
 msgstr "您无权设置这些用户口令!"
 
-#: plugins/admin/users/class_userManagement.inc:336
+#: plugins/admin/users/class_userManagement.inc:377
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "您将删除用户 %s。"
 
-#: plugins/admin/users/class_userManagement.inc:342
-#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:383
+#: plugins/admin/users/class_userManagement.inc:410
 msgid "You are not allowed to delete this user!"
 msgstr "您无权删除这个用户!"
 
-#: plugins/admin/users/class_userManagement.inc:553
+#: plugins/admin/users/class_userManagement.inc:594
 msgid "A person with the choosen name is already used in this tree."
 msgstr "使用所选名称的用户已经在树中被使用了。"
 
@@ -7194,15 +7211,20 @@ msgstr "从模板创建用户"
 msgid "Create user with this template"
 msgstr "创建使用该模板的用户"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:184
+#, fuzzy
+msgid "Deactivated"
+msgstr "活动"
+
+#: plugins/admin/users/class_divListUsers.inc:207
 msgid "password"
 msgstr "口令"
 
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:208
 msgid "Change password"
 msgstr "修改口令"
 
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:298
 msgid "Number of listed users"
 msgstr ""
 
@@ -9905,7 +9927,7 @@ msgstr "整合麦克风"
 #: include/sieve/templates/element_header.tpl:41
 #: include/sieve/templates/element_envelope.tpl:41
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:55 setup/setup_feedback.tpl:73
 #: setup/class_setupStep_Schema.inc:63
 msgid "Yes"
@@ -9922,7 +9944,7 @@ msgstr "是"
 #: include/sieve/templates/element_header.tpl:43
 #: include/sieve/templates/element_envelope.tpl:43
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config1.inc:87
-#: setup/class_setupStep_Config2.inc:129 setup/class_setupStep_Config3.inc:76
+#: setup/class_setupStep_Config2.inc:140 setup/class_setupStep_Config3.inc:77
 #: setup/setup_feedback.tpl:57 setup/setup_feedback.tpl:75
 #: setup/class_setupStep_Schema.inc:63
 msgid "No"
@@ -14201,7 +14223,7 @@ msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s',作为插件 '%s' 的 POSTCREATE 好像并不存在。"
 
-#: include/class_plugin.inc:597 include/class_password-methods.inc:182
+#: include/class_plugin.inc:597 include/class_password-methods.inc:200
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -14280,17 +14302,17 @@ msgstr "行"
 msgid "Arguments"
 msgstr "参数"
 
-#: include/class_password-methods.inc:166
+#: include/class_password-methods.inc:184
 #, php-format
 msgid "Setting the password failed. LDAP server says '%s'."
 msgstr "设置口令失败。LDAP 服务器报告说 '%s'。"
 
-#: include/class_password-methods.inc:203
+#: include/class_password-methods.inc:221
 #, php-format
 msgid "Setting for SMBHASH in %s is incorrect! Can't change Samba password."
 msgstr "在 %s 中的 SMBHASH 的设置不正确!无法修改 Samba 口令。"
 
-#: include/class_MultiSelectWindow.inc:457
+#: include/class_MultiSelectWindow.inc:461
 msgid ""
 "Error: The requested subtree has an inconsistent DN encoding, check your "
 "LDAP!"
@@ -15523,11 +15545,11 @@ msgstr "给出的口令最小长度不是数字。"
 msgid "The given password differ value is not numeric."
 msgstr "给出的口令差异值不是数字。"
 
-#: setup/class_setupStep_Config2.inc:79 setup/class_setupStep_Config2.inc:80
+#: setup/class_setupStep_Config2.inc:82 setup/class_setupStep_Config2.inc:83
 msgid "GOsa settings 2/3"
 msgstr "GOsa 设置 2/3"
 
-#: setup/class_setupStep_Config2.inc:81
+#: setup/class_setupStep_Config2.inc:84
 msgid "Customize special parameters"
 msgstr "定制特殊参数"
 
@@ -15760,19 +15782,19 @@ msgstr "拷贝 dns 时出错。"
 msgid "I have read the license and accept it"
 msgstr ""
 
-#: setup/class_setupStep_Config3.inc:67 setup/class_setupStep_Config3.inc:68
+#: setup/class_setupStep_Config3.inc:68 setup/class_setupStep_Config3.inc:69
 msgid "GOsa settings 3/3"
 msgstr "GOsa 设置 3/3"
 
-#: setup/class_setupStep_Config3.inc:69
+#: setup/class_setupStep_Config3.inc:70
 msgid "Tweak some GOsa core behaviour"
 msgstr "调整一些 GOsa 核心行为"
 
-#: setup/class_setupStep_Config3.inc:171
+#: setup/class_setupStep_Config3.inc:172
 msgid "Session lifetime must be a numeric value."
 msgstr "会话生存期必须是数字。"
 
-#: setup/class_setupStep_Config3.inc:175
+#: setup/class_setupStep_Config3.inc:176
 msgid "Maximal ldap query time must be a numeric value. "
 msgstr "最长 ldap 查询时间必须是数字。"
 
@@ -15815,26 +15837,36 @@ msgid "Enable Copy & Paste"
 msgstr "启用拷贝和粘贴"
 
 #: setup/setup_config2.tpl:111
+#, fuzzy
+msgid "Enable DNS extension"
+msgstr "启用该设备 DNS"
+
+#: setup/setup_config2.tpl:123
+#, fuzzy
+msgid "Enable DHCP extension"
+msgstr "LDAP 检查"
+
+#: setup/setup_config2.tpl:135
 msgid "Enable FAI release management"
 msgstr "启用 FAI 发布管理"
 
-#: setup/setup_config2.tpl:123
+#: setup/setup_config2.tpl:147
 msgid "Enable user netatalk plugin"
 msgstr "启用 user netatalk 插件"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:158
 msgid "Government mode"
 msgstr "政府模式"
 
-#: setup/setup_config2.tpl:147
+#: setup/setup_config2.tpl:171
 msgid "Mail method"
 msgstr "邮件方法"
 
-#: setup/setup_config2.tpl:161
+#: setup/setup_config2.tpl:185
 msgid "Vacation templates"
 msgstr "假期模板"
 
-#: setup/setup_config2.tpl:177
+#: setup/setup_config2.tpl:201
 msgid "Use Cyrus UNIX style"
 msgstr "使用 Cyrus Unix 风格"
 
@@ -16224,78 +16256,83 @@ msgid "Disable primary group filter"
 msgstr "禁用主要组过滤器"
 
 #: setup/setup_config3.tpl:18
+#, fuzzy
+msgid "Display summary in listings"
+msgstr "显示匹配的宏"
+
+#: setup/setup_config3.tpl:30
 msgid "Honour administrative units"
 msgstr "Honour administrative units"
 
-#: setup/setup_config3.tpl:30
+#: setup/setup_config3.tpl:42
 msgid "Smarty compile directory"
 msgstr "Smarty 编译目录"
 
-#: setup/setup_config3.tpl:39
+#: setup/setup_config3.tpl:51
 msgid "Path for PPD storage"
 msgstr "PPD 存储路径"
 
-#: setup/setup_config3.tpl:55
+#: setup/setup_config3.tpl:67
 msgid "Path for kiosk profile storage"
 msgstr "Kiosk profile 存储路径"
 
-#: setup/setup_config3.tpl:74
+#: setup/setup_config3.tpl:86
 msgid "Network resolv hook"
 msgstr "Network 解析钩子"
 
-#: setup/setup_config3.tpl:92
+#: setup/setup_config3.tpl:104
 msgid "Mail queue script"
 msgstr "邮件队列脚本"
 
-#: setup/setup_config3.tpl:110
+#: setup/setup_config3.tpl:122
 msgid "Notification script"
 msgstr "通知脚本"
 
-#: setup/setup_config3.tpl:126
+#: setup/setup_config3.tpl:138
 msgid "Login and session"
 msgstr "登录和会话"
 
-#: setup/setup_config3.tpl:129
+#: setup/setup_config3.tpl:141
 msgid "Enforce register_globals to be deactivated"
 msgstr "强制 register_globals 为不活动"
 
-#: setup/setup_config3.tpl:141
+#: setup/setup_config3.tpl:153
 msgid "Enforce encrypted connections"
 msgstr "强制加密连接"
 
-#: setup/setup_config3.tpl:153
+#: setup/setup_config3.tpl:165
 msgid "Warn if session is not encrypted"
 msgstr "如果会话不加密警告"
 
-#: setup/setup_config3.tpl:165
+#: setup/setup_config3.tpl:177
 msgid "Session lifetime"
 msgstr "会话生存期"
 
-#: setup/setup_config3.tpl:173
+#: setup/setup_config3.tpl:185
 msgid "Debugging"
 msgstr "Debugging"
 
-#: setup/setup_config3.tpl:177
+#: setup/setup_config3.tpl:189
 msgid "Show PHP errors"
 msgstr "显示 PHP 错误"
 
-#: setup/setup_config3.tpl:189
+#: setup/setup_config3.tpl:201
 msgid "Maximum LDAP query time"
 msgstr "最大 LDAP 查询时间"
 
-#: setup/setup_config3.tpl:207
+#: setup/setup_config3.tpl:219
 msgid "Log LDAP statistics"
 msgstr "Log LDAP 状态"
 
-#: setup/setup_config3.tpl:219
+#: setup/setup_config3.tpl:231
 msgid "Debug level"
 msgstr "Debug 级别"
 
-#: setup/setup_config3.tpl:224 setup/setup_config3.tpl:227
+#: setup/setup_config3.tpl:236 setup/setup_config3.tpl:239
 msgid "Disabled"
 msgstr "禁用"
 
-#: setup/setup_config3.tpl:225 setup/setup_config3.tpl:228
+#: setup/setup_config3.tpl:237 setup/setup_config3.tpl:240
 msgid "Enabled"
 msgstr "启用"
 
@@ -17069,9 +17106,6 @@ msgstr "Schema 检查失败"
 #~ msgstr ""
 #~ "目录 '%s' 作为 smarty 编译目录无法访问,请检查该目录是否存在以及权限!"
 
-#~ msgid "Display macros  matching"
-#~ msgstr "显示匹配的宏"
-
 #~ msgid ""
 #~ "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
 #~ "setup"